diff options
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/ada-mode.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/f90.el | 11 | ||||
| -rw-r--r-- | lisp/progmodes/fortran.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/js.el | 6 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 5 |
5 files changed, 16 insertions, 12 deletions
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 89cbdd18454..26b68bf9c2b 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -135,7 +135,7 @@ "Return Ada mode version." (interactive) (let ((version-string "4.00")) - (if (interactive-p) + (if (called-interactively-p 'interactive) (message version-string) version-string))) diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 58a82a8918b..49f908c99f9 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -1505,7 +1505,8 @@ Return (TYPE NAME), or nil if not found." matching-beg ;; Note this includes the case of an un-named main program, ;; in which case we go to (point-min). - (if (interactive-p) (message "No beginning found")) + (if (called-interactively-p 'interactive) + (message "No beginning found")) nil))) (defun f90-end-of-subprogram () @@ -1530,7 +1531,8 @@ Return (TYPE NAME), or nil if not found." ;;; (forward-line 1) (if (zerop count) matching-end - (if (interactive-p) (message "No end found")) + (if (called-interactively-p 'interactive) + (message "No end found")) nil))) @@ -1542,7 +1544,8 @@ for consistency of block types and labels (if present), and completes outermost block if `f90-smart-end' is non-nil. Interactively, pushes mark before moving point." (interactive "p") - (if (interactive-p) (push-mark (point) t)) ; can move some distance + (if (called-interactively-p 'interactive) + (push-mark (point) t)) ; can move some distance (and num (< num 0) (f90-beginning-of-block (- num))) (let ((f90-smart-end (if f90-smart-end 'no-blink)) ; for final match-end (case-fold-search t) @@ -1598,7 +1601,7 @@ Checks for consistency of block types and labels (if present). Does not check the outermost block, because it may be incomplete. Interactively, pushes mark before moving point." (interactive "p") - (if (interactive-p) (push-mark (point) t)) + (if (called-interactively-p 'interactive) (push-mark (point) t)) (and num (< num 0) (f90-end-of-block (- num))) (let ((case-fold-search t) (count (or num 1)) diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index 71913d0eca0..02346c14967 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -1295,7 +1295,7 @@ If NUM is negative, go backward to the start of a block. Does not check for consistency of block types. Interactively, pushes mark before moving point." (interactive "p") - (if (interactive-p) (push-mark (point) t)) + (if (called-interactively-p 'interactive) (push-mark (point) t)) (and num (< num 0) (fortran-beginning-of-block (- num))) (let ((case-fold-search t) (count (or num 1))) @@ -1328,7 +1328,7 @@ blocks. If NUM is negative, go forward to the end of a block. Does not check for consistency of block types. Interactively, pushes mark before moving point." (interactive "p") - (if (interactive-p) (push-mark (point) t)) + (if (called-interactively-p 'interactive) (push-mark (point) t)) (and num (< num 0) (fortran-end-of-block (- num))) (let ((case-fold-search t) (count (or num 1))) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index d2264043cb5..96b49499f4f 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1595,7 +1595,7 @@ context." (let* ((syntactic-context (js--syntactic-context-from-pstate (js--parse-state-at-point)))) - (when (interactive-p) + (when (called-interactively-p 'interactive) (message "Syntactic context: %s" syntactic-context)) syntactic-context)) @@ -2821,7 +2821,7 @@ With argument, run even if no intervening GC has happened." (setq num (js--js-funcall '(repl "_jsGC") (or keys []))) (setq js--js-last-gcs-done this-gcs-done) - (when (interactive-p) + (when (called-interactively-p 'interactive) (message "Cleaned %s entries" num)) num))) @@ -2835,7 +2835,7 @@ With argument, run even if no intervening GC has happened." (let* ((content-window (js--js-content-window (js--get-js-context))) (result (js-eval content-window js))) - (when (interactive-p) + (when (called-interactively-p 'interactive) (message "%s" (js! "String" result))) result))) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 4582163e17b..eb33c760b64 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -1785,7 +1785,8 @@ will." (with-output-to-temp-buffer (help-buffer) (with-current-buffer standard-output ;; Fixme: Is this actually useful? - (help-setup-xref (list 'python-describe-symbol symbol) (interactive-p)) + (help-setup-xref (list 'python-describe-symbol symbol) + (called-interactively-p 'interactive)) (set (make-local-variable 'comint-redirect-subvert-readonly) t) (help-print-return-message)))) (comint-redirect-send-command-to-process (format "emacs.ehelp(%S, %s)" @@ -2797,7 +2798,7 @@ filter." (python-toggle-shells python-default-interpreter)) (let ((args python-which-args)) (when (and argprompt - (interactive-p) + (called-interactively-p 'interactive) (fboundp 'split-string)) ;; TBD: Perhaps force "-i" in the final list? (setq args (split-string |