[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r107140: * doc.c (store_function_docs
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r107140: * doc.c (store_function_docstring): Avoid applying docstring of alias to base function. |
Date: |
Mon, 06 Feb 2012 21:43:39 +0800 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 107140
fixes bug(s): http://debbugs.gnu.org/2603
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2012-02-06 21:43:39 +0800
message:
* doc.c (store_function_docstring): Avoid applying docstring of alias to base
function.
modified:
src/ChangeLog
src/doc.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-02-04 19:57:12 +0000
+++ b/src/ChangeLog 2012-02-06 13:43:39 +0000
@@ -1,3 +1,8 @@
+2012-02-06 Chong Yidong <address@hidden>
+
+ * doc.c (store_function_docstring): Avoid applying docstring of
+ alias to base function (Bug#2603).
+
2012-02-04 Andreas Schwab <address@hidden>
* .gdbinit (pp1, pv1): Remove redundant defines.
=== modified file 'src/doc.c'
--- a/src/doc.c 2012-01-19 07:21:25 +0000
+++ b/src/doc.c 2012-02-06 13:43:39 +0000
@@ -502,10 +502,12 @@
/* 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. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r107140: * doc.c (store_function_docstring): Avoid applying docstring of alias to base function.,
Chong Yidong <=