aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2004-11-04 10:15:37 +0000
committerRichard M. Stallman2004-11-04 10:15:37 +0000
commit2de9d0c3be3d4e02d57ae96ae5bfe40cd4f45767 (patch)
tree7f95648a320473bab6bee703e348c293833095ba
parent3fc1b2647547d95bbb2418f87fec6dd17f615bd4 (diff)
downloademacs-2de9d0c3be3d4e02d57ae96ae5bfe40cd4f45767.tar.gz
emacs-2de9d0c3be3d4e02d57ae96ae5bfe40cd4f45767.zip
(browse-url-maybe-new-window): Use called-interactively-p.
-rw-r--r--lisp/net/browse-url.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 1dbd97f0073..c5a2218e36e 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -596,10 +596,11 @@ for use in `interactive'."
596 (not (eq (null browse-url-new-window-flag) 596 (not (eq (null browse-url-new-window-flag)
597 (null current-prefix-arg))))) 597 (null current-prefix-arg)))))
598 598
599;; interactive-p needs to be called at a function's top-level, hence 599;; called-interactive-p needs to be called at a function's top-level, hence
600;; the macro. 600;; this macro. We use that rather than interactive-p because
601;; use in a keyboard macro should not change this behavior.
601(defmacro browse-url-maybe-new-window (arg) 602(defmacro browse-url-maybe-new-window (arg)
602 `(if (not (interactive-p)) 603 `(if (or noninteractive (not (called-interactively-p)))
603 ,arg 604 ,arg
604 browse-url-new-window-flag)) 605 browse-url-new-window-flag))
605 606