diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-05 11:22:29 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-05 11:23:04 -0700 |
| commit | b6b2554f8b9fefe9242b5dbd34211b3ff44a5a65 (patch) | |
| tree | 4dfaebea7904619d499c553a9c6e2e7612a5151b /lisp/emacs-lisp | |
| parent | ba521e7029ef2893a135ebec8cc472f3d45bf668 (diff) | |
| download | emacs-b6b2554f8b9fefe9242b5dbd34211b3ff44a5a65.tar.gz emacs-b6b2554f8b9fefe9242b5dbd34211b3ff44a5a65.tar.bz2 emacs-b6b2554f8b9fefe9242b5dbd34211b3ff44a5a65.zip | |
Fix fix for describe-function keybinding confusion
This fixes a bug introduced by the previous patch.
* lisp/help-fns.el (help-fns--signature):
Last arg of help-fns--signature is now a buffer, or nil if a
raw signature is wanted. All callers changed.
(describe-function-1): Use this to do the right thing with signatures.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/pcase.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el index 5fe36bb92d4..c7f07846618 100644 --- a/lisp/emacs-lisp/pcase.el +++ b/lisp/emacs-lisp/pcase.el @@ -164,7 +164,7 @@ Currently, the following patterns are provided this way:" expansion)))) (declare-function help-fns--signature "help-fns" - (function doc real-def real-function raw)) + (function doc real-def real-function buffer)) ;; FIXME: Obviously, this will collide with nadvice's use of ;; function-documentation if we happen to advise `pcase'. @@ -184,7 +184,7 @@ Currently, the following patterns are provided this way:" (insert "\n\n-- ") (let* ((doc (documentation me 'raw))) (setq doc (help-fns--signature symbol doc me - (indirect-function me) t)) + (indirect-function me) nil)) (insert "\n" (or doc "Not documented."))))))) (let ((combined-doc (buffer-string))) (if ud (help-add-fundoc-usage combined-doc (car ud)) combined-doc))))) |