diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2009-10-02 00:02:02 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2009-10-02 00:02:02 +0000 |
| commit | 12a3c28c787e23801f40ea557a5c00b538968a52 (patch) | |
| tree | bab1efcce46945c99a9d4305a0ef06e85fc28a0f /lisp/emacs-lisp | |
| parent | 8d148b0dd164a0e53e21719d391005d9d68902c6 (diff) | |
| download | emacs-12a3c28c787e23801f40ea557a5c00b538968a52.tar.gz emacs-12a3c28c787e23801f40ea557a5c00b538968a52.tar.bz2 emacs-12a3c28c787e23801f40ea557a5c00b538968a52.zip | |
* image-mode.el (image-toggle-display):
* emacs-lisp/elp.el (elp-instrument-function):
* emacs-lisp/advice.el (ad-make-advised-definition):
* emacs-lisp/easy-mmode.el (define-minor-mode):
* net/browse-url.el (browse-url-maybe-new-window):
* progmodes/sh-script.el (sh-learn-buffer-indent):
Pass new argument 'any to `called-interactively-p'.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/advice.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/easy-mmode.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/elp.el | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 8342f14ec5b..8979f9dfa10 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -3087,7 +3087,7 @@ in any of these classes." (not advised-interactive-form)) ;; Check whether we were called interactively ;; in order to do proper prompting: - `(if (called-interactively-p) + `(if (called-interactively-p 'any) (call-interactively ',origname) ,(ad-make-mapped-call advised-arglist orig-arglist diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index 12458f3a6b9..def270cbc6d 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -234,7 +234,7 @@ With zero or negative ARG turn mode off. ,@body ;; The on/off hooks are here for backward compatibility only. (run-hooks ',hook (if ,mode ',hook-on ',hook-off)) - (if (called-interactively-p) + (if (called-interactively-p 'any) (progn ,(if globalp `(customize-mark-as-set ',mode)) ;; Avoid overwriting a message shown by the body, diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el index 5fede8243c0..1664a769835 100644 --- a/lisp/emacs-lisp/elp.el +++ b/lisp/emacs-lisp/elp.el @@ -269,7 +269,7 @@ FUNSYM must be a symbol of a defined function." (setq newguts (append newguts `((elp-wrapper (quote ,funsym) ,(when (commandp funsym) - '(called-interactively-p)) + '(called-interactively-p 'any)) args)))) ;; to record profiling times, we set the symbol's function ;; definition so that it runs the elp-wrapper function with the |