auto upstream

2 files changed, 13 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b19ecc926d0..4b5e56f5dc2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-30  Juanma Barranquero  <lekktu@gmail.com>
+
+        * doc.c (Fdocumentation): Re-add handling of function-documentation,
+        accidentally removed in 2012-11-09T04:10:16Z!monnier@iro.umontreal.ca (bug#13034).
+
 2012-11-29  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * xdisp.c (window_outdated): Remove eassert since it hits
diff --git a/src/doc.c b/src/doc.c
index 1d3d1e64442..76008295add 100644
--- 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);