diff options
| author | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
|---|---|---|
| committer | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
| commit | df1a71272e5cdd10b511e2ffd702ca50ddd8a773 (patch) | |
| tree | 9b9ac725394ee80891e2bff57b6407d0e491e71a /lisp/help.el | |
| parent | eb27fc4d49e8c914cd0e6a8a2d02159601542141 (diff) | |
| parent | 32daa3cb54523006c88717cbeac87964cd687a1b (diff) | |
| download | emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.tar.gz emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/help.el')
| -rw-r--r-- | lisp/help.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/help.el b/lisp/help.el index 0fb1c2dab77..bc7ee2c9b1b 100644 --- a/lisp/help.el +++ b/lisp/help.el | |||
| @@ -1384,6 +1384,9 @@ If PRESERVE-NAMES is non-nil, return a formal arglist that uses | |||
| 1384 | the same names as used in the original source code, when possible." | 1384 | the same names as used in the original source code, when possible." |
| 1385 | ;; Handle symbols aliased to other symbols. | 1385 | ;; Handle symbols aliased to other symbols. |
| 1386 | (if (and (symbolp def) (fboundp def)) (setq def (indirect-function def))) | 1386 | (if (and (symbolp def) (fboundp def)) (setq def (indirect-function def))) |
| 1387 | ;; Advice wrappers have "catch all" args, so fetch the actual underlying | ||
| 1388 | ;; function to find the real arguments. | ||
| 1389 | (while (advice--p def) (setq def (advice--cdr def))) | ||
| 1387 | ;; If definition is a macro, find the function inside it. | 1390 | ;; If definition is a macro, find the function inside it. |
| 1388 | (if (eq (car-safe def) 'macro) (setq def (cdr def))) | 1391 | (if (eq (car-safe def) 'macro) (setq def (cdr def))) |
| 1389 | (cond | 1392 | (cond |