* 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'.

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

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,

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