diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-02-10 10:58:48 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-02-10 10:58:48 -0800 |
| commit | 6e6c82a4e687708d5a7a3887f92db45bd74da276 (patch) | |
| tree | 85dc3105240e84a8cddadb25d572e170fcdbd8bc /src/doc.c | |
| parent | 78df1fb1d46d556bfc2698ca1802972b13613ba8 (diff) | |
| parent | cc26d239af9a82cff079556a1daff4b4bf60eb5c (diff) | |
| download | emacs-6e6c82a4e687708d5a7a3887f92db45bd74da276.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/doc.c')
| -rw-r--r-- | src/doc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/doc.c b/src/doc.c index 1a7b307816d..d71a3ce1d80 100644 --- a/src/doc.c +++ b/src/doc.c @@ -507,9 +507,11 @@ aren't strings. */) /* Scanning the DOC files and placing docstring offsets into functions. */ static void -store_function_docstring (Lisp_Object fun, ptrdiff_t offset) +store_function_docstring (Lisp_Object obj, ptrdiff_t offset) { - 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 = SYMBOLP (obj) ? XSYMBOL (obj)->function : obj; /* The type determines where the docstring is stored. */ |