Mercurial > emacs
comparison lisp/help.el @ 105372:bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Fri, 02 Oct 2009 03:48:36 +0000 |
parents | fb7e59394e9b |
children | 3cdeeb563149 |
comparison
equal
deleted
inserted
replaced
105371:0769a73f1d18 | 105372:bd2966850aac |
---|---|
459 (defun view-lossage () | 459 (defun view-lossage () |
460 "Display last 300 input keystrokes. | 460 "Display last 300 input keystrokes. |
461 | 461 |
462 To record all your input on a file, use `open-dribble-file'." | 462 To record all your input on a file, use `open-dribble-file'." |
463 (interactive) | 463 (interactive) |
464 (help-setup-xref (list #'view-lossage) (interactive-p)) | 464 (help-setup-xref (list #'view-lossage) |
465 (called-interactively-p 'interactive)) | |
465 (with-help-window (help-buffer) | 466 (with-help-window (help-buffer) |
466 (princ (mapconcat (lambda (key) | 467 (princ (mapconcat (lambda (key) |
467 (if (or (integerp key) (symbolp key) (listp key)) | 468 (if (or (integerp key) (symbolp key) (listp key)) |
468 (single-key-description key) | 469 (single-key-description key) |
469 (prin1-to-string key nil))) | 470 (prin1-to-string key nil))) |
490 The optional argument BUFFER specifies which buffer's bindings | 491 The optional argument BUFFER specifies which buffer's bindings |
491 to display (default, the current buffer). BUFFER can be a buffer | 492 to display (default, the current buffer). BUFFER can be a buffer |
492 or a buffer name." | 493 or a buffer name." |
493 (interactive) | 494 (interactive) |
494 (or buffer (setq buffer (current-buffer))) | 495 (or buffer (setq buffer (current-buffer))) |
495 (help-setup-xref (list #'describe-bindings prefix buffer) (interactive-p)) | 496 (help-setup-xref (list #'describe-bindings prefix buffer) |
497 (called-interactively-p 'interactive)) | |
496 (with-current-buffer buffer | 498 (with-current-buffer buffer |
497 (describe-bindings-internal nil prefix))) | 499 (describe-bindings-internal nil prefix))) |
498 | 500 |
499 ;; This function used to be in keymap.c. | 501 ;; This function used to be in keymap.c. |
500 (defun describe-bindings-internal (&optional menus prefix) | 502 (defun describe-bindings-internal (&optional menus prefix) |
719 (eq (key-binding (substring key 0 -1)) 'yank-menu)) | 721 (eq (key-binding (substring key 0 -1)) 'yank-menu)) |
720 (setq defn 'menu-bar-select-yank)) | 722 (setq defn 'menu-bar-select-yank)) |
721 (if (or (null defn) (integerp defn) (equal defn 'undefined)) | 723 (if (or (null defn) (integerp defn) (equal defn 'undefined)) |
722 (message "%s%s is undefined" | 724 (message "%s%s is undefined" |
723 (help-key-description key untranslated) mouse-msg) | 725 (help-key-description key untranslated) mouse-msg) |
724 (help-setup-xref (list #'describe-function defn) (interactive-p)) | 726 (help-setup-xref (list #'describe-function defn) |
727 (called-interactively-p 'interactive)) | |
725 ;; Don't bother user with strings from (e.g.) the select-paste menu. | 728 ;; Don't bother user with strings from (e.g.) the select-paste menu. |
726 (when (stringp (aref key (1- (length key)))) | 729 (when (stringp (aref key (1- (length key)))) |
727 (aset key (1- (length key)) "(any string)")) | 730 (aset key (1- (length key)) "(any string)")) |
728 (when (and untranslated | 731 (when (and untranslated |
729 (stringp (aref untranslated (1- (length untranslated))))) | 732 (stringp (aref untranslated (1- (length untranslated))))) |
796 variable \(listed in `minor-mode-alist') must also be a function | 799 variable \(listed in `minor-mode-alist') must also be a function |
797 whose documentation describes the minor mode." | 800 whose documentation describes the minor mode." |
798 (interactive "@") | 801 (interactive "@") |
799 (unless buffer (setq buffer (current-buffer))) | 802 (unless buffer (setq buffer (current-buffer))) |
800 (help-setup-xref (list #'describe-mode buffer) | 803 (help-setup-xref (list #'describe-mode buffer) |
801 (interactive-p)) | 804 (called-interactively-p 'interactive)) |
802 ;; For the sake of help-do-xref and help-xref-go-back, | 805 ;; For the sake of help-do-xref and help-xref-go-back, |
803 ;; don't switch buffers before calling `help-buffer'. | 806 ;; don't switch buffers before calling `help-buffer'. |
804 (with-help-window (help-buffer) | 807 (with-help-window (help-buffer) |
805 (with-current-buffer buffer | 808 (with-current-buffer buffer |
806 (let (minor-modes) | 809 (let (minor-modes) |