(browse-url-maybe-new-window): Delete macro and

its uses.

1 files changed, 8 insertions, 18 deletions

diff --git a/lisp/browse-url.el b/lisp/browse-url.el
index cc63b39c7bd..28e03b11b75 100644
--- a/lisp/browse-url.el
+++ b/lisp/browse-url.el
@@ -492,13 +492,6 @@ negation if a prefix argument was given."
 	(not (eq (null browse-url-new-window-p)
 		 (null current-prefix-arg)))))
 
-;; interactive-p needs to be called at a function's top-level, hence
-;; the macro.
-(defmacro browse-url-maybe-new-window (arg)
-  `(if (interactive-p)
-       'arg
-     browse-url-new-window-p))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Browse current buffer
 
@@ -717,9 +710,7 @@ used instead of `browse-url-new-window-p'."
 			     (if new-window '("-noraise"))
 			     (list "-remote"
 				   (concat "openURL(" url
-					   (if (browse-url-maybe-new-window
-						new-window)
-					       ",new-window")
+					   (if new-window ",new-window")
 					   ")"))))))))
     (set-process-sentinel process
 			  (list 'lambda '(process change)
@@ -757,7 +748,6 @@ How depends on `browse-url-netscape-version'."
 
 ;;;###autoload
 (defun browse-url-mosaic (url &optional new-window)
-  ;; new-window ignored
   "Ask the XMosaic WWW browser to load URL.
 
 Default to the URL around or before point.  The strings in variable
@@ -785,9 +775,9 @@ used instead of `browse-url-new-window-p'."
 	(save-excursion
 	  (find-file (format "/tmp/Mosaic.%d" pid))
 	  (erase-buffer)
-	  (insert (if (browse-url-maybe-new-window new-window)
+	  (insert (if new-window
 		      "newwin\n"
-		      "goto\n")
+		    "goto\n")
 		  url "\n")
 	  (save-buffer)
 	  (kill-buffer nil)
@@ -852,7 +842,7 @@ used instead of `browse-url-new-window-p'."
   ;; Todo: start browser if fails
   (process-send-string "browse-url"
 		       (concat "get url (" url ") output "
-			       (if (browse-url-maybe-new-window new-window)
+			       (if new-window
 				   "new"
 				 "current")
 			       "\r\n"))
@@ -885,7 +875,7 @@ When called non-interactively, optional second argument NEW-WINDOW is
 used instead of `browse-url-new-window-p'."
   (interactive (browse-url-interactive-arg "W3 URL: "))
   (require 'w3)				; w3-fetch-other-window not autoloaded
-  (if (browse-url-maybe-new-window new-window)
+  (if new-window
       (w3-fetch-other-window url)
     (w3-fetch url)))
 
@@ -934,13 +924,13 @@ used instead of `browse-url-new-window-p'."
 	 (buf (get-buffer "*lynx*"))
 	 (proc (and buf (get-buffer-process buf)))
 	 (n browse-url-lynx-input-attempts))
-    (if (and (browse-url-maybe-new-window new-buffer) buf)
+    (if (and new-buffer buf)
 	;; Rename away the OLD buffer. This isn't very polite, but
 	;; term insists on working in a buffer named *lynx* and would
 	;; choke on *lynx*<1>
 	(progn (set-buffer buf)
 	       (rename-uniquely)))
-    (if (or (browse-url-maybe-new-window new-buffer)
+    (if (or new-buffer
 	    (not buf)
 	    (not proc)
 	    (not (memq (process-status proc) '(run stop))))
@@ -1019,7 +1009,7 @@ used instead of `browse-url-new-window-p'."
     (let ((to (if (string-match "^mailto:" url)
 		  (substring url 7)
 		url)))
-      (if (browse-url-maybe-new-window new-window)
+      (if new-window
 	  (compose-mail-other-window to nil nil nil
 				     (list 'insert-buffer (current-buffer)))
 	(compose-mail to nil nil nil nil