* doc.c (store_function_docstring): Avoid applying docstring of alias to base function.

Fixes: debbugs:2603

diff --git a/src/ChangeLog b/src/ChangeLog
index 2353cc1eca2f735b9ad02405a5f09faf0d506471..860a0592e29e06edb2ce2f185907c664e4db199b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-06  Chong Yidong  <cyd@gnu.org>
+
+       * doc.c (store_function_docstring): Avoid applying docstring of
+       alias to base function (Bug#2603).
+
 2012-02-04  Andreas Schwab  <schwab@linux-m68k.org>
 
        * .gdbinit (pp1, pv1): Remove redundant defines.

diff --git a/src/doc.c b/src/doc.c
index 7bdb8c658b0e6f3f7a1e33aba175a9fc1cea14af..ad2c667e7712b82e5e79bc78c89201d673ccd89e 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -502,10 +502,12 @@ aren't strings.  */)
 /* Scanning the DOC files and placing docstring offsets into functions.  */
 
 static void
-store_function_docstring (Lisp_Object fun, EMACS_INT offset)
+store_function_docstring (Lisp_Object sym, EMACS_INT offset)
 /* Use EMACS_INT because we get offset from pointer subtraction.  */
 {
-  fun = indirect_function (fun);
+  /* Don't use indirect_function here, or defaliases will apply their
+     docstrings to the base functions (Bug#2603).  */
+  Lisp_Object fun = XSYMBOL (sym)->function;
 
   /* The type determines where the docstring is stored.  */