diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/advice.el | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/checkdoc.el | 19 | ||||
| -rw-r--r-- | lisp/emacs-lisp/debug.el | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/easy-mmode.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eieio-opt.el | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mnt.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/shadow.el | 2 |
8 files changed, 23 insertions, 18 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 8979f9dfa10..4165cb5f193 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -218,7 +218,7 @@ ;; "Make `car' an interactive function." ;; (interactive "xCar of list: ") ;; ad-do-it -;; (if (interactive-p) +;; (if (called-interactively-p 'interactive) ;; (message "%s" ad-return-value))) @@ -2390,7 +2390,7 @@ All currently advised functions will be considered." (interactive (list (ad-read-regexp "Enable advices via regexp"))) (let ((matched-advices (ad-enable-regexp-internal regexp 'any t))) - (if (interactive-p) + (if (called-interactively-p 'interactive) (message "%d matching advices enabled" matched-advices)) matched-advices)) @@ -2400,7 +2400,7 @@ All currently advised functions will be considered." (interactive (list (ad-read-regexp "Disable advices via regexp"))) (let ((matched-advices (ad-enable-regexp-internal regexp 'any nil))) - (if (interactive-p) + (if (called-interactively-p 'interactive) (message "%d matching advices disabled" matched-advices)) matched-advices)) diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index bf00bbb4420..fc5b3081a6d 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -505,7 +505,7 @@ Return FILE if there was no autoload cookie in it, else nil." (no-autoloads (autoload-generate-file-autoloads file))) (if autoload-modified-buffers (if save-after (autoload-save-buffers)) - (if (interactive-p) + (if (called-interactively-p 'interactive) (message "Autoload section for %s is up to date." file))) (if no-autoloads file))) diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index b49638b8229..226ee17ce51 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -853,7 +853,8 @@ With a prefix argument (in Lisp, the argument TAKE-NOTES), store all errors found in a warnings buffer, otherwise stop after the first error." (interactive "P") - (if (interactive-p) (message "Checking buffer for style...")) + (if (called-interactively-p 'interactive) + (message "Checking buffer for style...")) ;; Assign a flag to spellcheck flag (let ((checkdoc-spellcheck-documentation-flag (car (memq checkdoc-spellcheck-documentation-flag @@ -870,7 +871,7 @@ otherwise stop after the first error." (checkdoc-start) (checkdoc-message-text) (checkdoc-rogue-spaces) - (not (interactive-p)) + (not (called-interactively-p 'interactive)) (if take-notes (checkdoc-show-diagnostics)) (message "Checking buffer for style...Done.")))) @@ -884,7 +885,7 @@ a separate buffer." (interactive "P") (let ((p (point))) (goto-char (point-min)) - (if (and take-notes (interactive-p)) + (if (and take-notes (called-interactively-p 'interactive)) (checkdoc-start-section "checkdoc-start")) (checkdoc-continue take-notes) ;; Go back since we can't be here without success above. @@ -920,7 +921,7 @@ is the starting location. If this is nil, `point-min' is used instead." (if (not take-notes) (error "%s" (checkdoc-error-text msg))))) (checkdoc-show-diagnostics) - (if (interactive-p) + (if (called-interactively-p 'interactive) (message "No style warnings.")))) (defun checkdoc-next-docstring () @@ -968,7 +969,7 @@ Optional argument INTERACT permits more interactive fixing." (e (checkdoc-rogue-space-check-engine nil nil interact)) (checkdoc-generate-compile-warnings-flag (or take-notes checkdoc-generate-compile-warnings-flag))) - (if (not (interactive-p)) + (if (not (called-interactively-p 'interactive)) e (if e (message "%s" (checkdoc-error-text e)) @@ -986,13 +987,14 @@ Optional argument TAKE-NOTES causes all errors to be logged." (checkdoc-generate-compile-warnings-flag (or take-notes checkdoc-generate-compile-warnings-flag))) (setq e (checkdoc-message-text-search)) - (if (not (interactive-p)) + (if (not (called-interactively-p 'interactive)) e (if e (error "%s" (checkdoc-error-text e)) (checkdoc-show-diagnostics))) (goto-char p)) - (if (interactive-p) (message "Checking interactive message text...done."))) + (if (called-interactively-p 'interactive) + (message "Checking interactive message text...done."))) ;;;###autoload (defun checkdoc-eval-defun () @@ -1041,7 +1043,8 @@ space at the end of each line." (if msg (if no-error (message "%s" (checkdoc-error-text msg)) (error "%s" (checkdoc-error-text msg)))))) - (if (interactive-p) (message "Checkdoc: done.")))))) + (if (called-interactively-p 'interactive) + (message "Checkdoc: done.")))))) ;;; Ispell interface for forcing a spell check ;; diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index baad2559e0c..59c37a5f3d5 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -873,7 +873,8 @@ To specify a nil argument interactively, exit with an empty minibuffer." "Display a list of all the functions now set to debug on entry." (interactive) (require 'help-mode) - (help-setup-xref '(debugger-list-functions) (interactive-p)) + (help-setup-xref '(debugger-list-functions) + (called-interactively-p 'interactive)) (with-output-to-temp-buffer (help-buffer) (with-current-buffer standard-output (if (null debug-function-list) diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index def270cbc6d..b667d39ea17 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -533,7 +533,7 @@ BODY is executed after moving to the destination location." (error "No next %s" ,name)) (goto-char (match-beginning 0)) (when (and (eq (current-buffer) (window-buffer (selected-window))) - (interactive-p)) + (called-interactively-p 'interactive)) (let ((endpt (or (save-excursion ,(if endfun `(,endfun) `(re-search-forward ,re nil t 2))) diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el index 12fd666f415..b2359f74a17 100644 --- a/lisp/emacs-lisp/eieio-opt.el +++ b/lisp/emacs-lisp/eieio-opt.el @@ -80,7 +80,7 @@ Optional HEADERFCN should be called to insert a few bits of info first." (interactive (list (eieio-read-class "Class: "))) (with-output-to-temp-buffer (help-buffer) ;"*Help*" (help-setup-xref (list #'eieio-describe-class class headerfcn) - (interactive-p)) + (called-interactively-p 'interactive)) (when headerfcn (funcall headerfcn)) @@ -312,7 +312,8 @@ Also extracts information about all methods specific to this generic." (if (not (generic-p generic)) (signal 'wrong-type-argument '(generic-p generic))) (with-output-to-temp-buffer (help-buffer) ; "*Help*" - (help-setup-xref (list #'eieio-describe-generic generic) (interactive-p)) + (help-setup-xref (list #'eieio-describe-generic generic) + (called-interactively-p 'interactive)) (prin1 generic) (princ " is a generic function") diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el index 6b6c74be786..a748835d477 100644 --- a/lisp/emacs-lisp/lisp-mnt.el +++ b/lisp/emacs-lisp/lisp-mnt.el @@ -583,7 +583,7 @@ which do not include a recognizable synopsis." (let ((must-kill (and file (not (get-file-buffer file))))) (when file (find-file file)) (prog1 - (if (interactive-p) + (if (called-interactively-p 'interactive) (message "%s" (lm-summary)) (lm-summary)) (when must-kill (kill-buffer (current-buffer)))))))) diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index 62feb15939d..d86718884f3 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el @@ -241,7 +241,7 @@ function, `find-emacs-lisp-shadows'." (setq shadows (cdr (cdr shadows)))) (if stringp (buffer-string) - (if (interactive-p) + (if (called-interactively-p 'interactive) (save-excursion ;; We are interactive. ;; Create the *Shadows* buffer and display shadowings there. |