Merge from emacs-24; up to 2012-12-01T13:25:13Z!cyd@gnu.org

[gnu-emacs] / src / doc.c

diff --git a/src/doc.c b/src/doc.c
index 1d3d1e644426d18e5761943088f9b1daa893e4e4..76008295addab165c9f5be91aaa611ff08f35dc0 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -338,6 +338,14 @@ string is passed through `substitute-command-keys'.  */)
 
   doc = Qnil;
 
+  if (SYMBOLP (function))
+    {
+      Lisp_Object tem = Fget (function, Qfunction_documentation);
+      if (!NILP (tem))
+       return Fdocumentation_property (function, Qfunction_documentation,
+                                       raw);
+    }
+
   fun = Findirect_function (function, Qnil);
   if (CONSP (fun) && EQ (XCAR (fun), Qmacro))
     fun = XCDR (fun);