diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-19 00:47:00 +0200 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-19 00:47:00 +0200 |
| commit | 68cb71c0928eb8b10487a125192f43923e8bfe7f (patch) | |
| tree | 053133358af1bd991d60ed6c29590ad84b29fed0 /lisp/help-fns.el | |
| parent | 87c9d8fcec183c8f4933e218c1895b6a0722b1e1 (diff) | |
| parent | 9ae514a9b7ed368ea97ddefa806079b6423833cb (diff) | |
| download | emacs-68cb71c0928eb8b10487a125192f43923e8bfe7f.tar.gz | |
Merge from origin/emacs-25
9ae514a * etc/AUTHORS: Update the AUTHORS file
3ca428e add entries to authors.el
66d556b Fix eldoc-related freezes in python mode
d59bcbc Handle mouse leaving initial window in `mouse-set-region' (Bu...
27fe1e4 org.el: Fix bindings of < and > for calendar scrolling
a813487 Fix undo boundary in recursive edit (Bug#23632)
1f85b7c Doc fixes re alist-get. (Bug#23548)
ba3f206 * lisp/progmodes/python.el (inferior-python-mode): Avoid tabs...
56fa055 * src/syntax.c (syms_of_syntax) <comment-end-can-be-escaped>:...
4c1370a * lisp/help-fns.el (describe-function-1): Fix handling of fil...
a3f7ae8 * lisp/emacs-lisp/cl-macs.el (cl-loop): Doc fix re "by".
601b9b2 * doc/misc/cl.texi (Mapping over Sequences): Fix cl-notevery.
Diffstat (limited to 'lisp/help-fns.el')
| -rw-r--r-- | lisp/help-fns.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/help-fns.el b/lisp/help-fns.el index e92019f9345..97c8df2298a 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -583,7 +583,8 @@ FILE is the file where FUNCTION was probably defined." (sig-key (if (subrp def) (indirect-function real-def) real-def)) - (file-name (find-lisp-object-file-name function def)) + (file-name (find-lisp-object-file-name function (if aliased 'defun + def))) (pt1 (with-current-buffer (help-buffer) (point))) (beg (if (and (or (byte-code-function-p def) (keymapp def) |