[Emacs-diffs] /srv/bzr/emacs/trunk r111042: src/doc.c: Fix bug#13034.

[Juanma Barranquero]

------------------------------------------------------------
revno: 111042
fixes bug: http://debbugs.gnu.org/13034
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2012-11-30 18:27:41 +0100
message:
  src/doc.c: Fix bug#13034.
  (Fdocumentation): Re-add handling of function-documentation,
  accidentally removed in revno:110851.
modified:
  src/ChangeLog
  src/doc.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-11-29 06:00:21 +0000
+++ b/src/ChangeLog     2012-11-30 17:27:41 +0000
@@ -1,3 +1,8 @@
+2012-11-30  Juanma Barranquero  <address@hidden>
+
+       * doc.c (Fdocumentation): Re-add handling of function-documentation,
+       accidentally removed in revno:110851 (bug#13034).
+
 2012-11-29  Dmitry Antipov  <address@hidden>
 
        * xdisp.c (window_outdated): Remove eassert since it hits

=== modified file 'src/doc.c'
--- a/src/doc.c 2012-11-09 04:10:16 +0000
+++ b/src/doc.c 2012-11-30 17:27:41 +0000
@@ -338,6 +338,14 @@
 
   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);