Subject: bug#19921: [PATCH] browse-url-firefox: Remove MS-Windows special case.

From: Ulrich Mueller <[email-masked]>
Date: Sat, 7 Mar 2015 12:16:23 +0100

Firefox on MS-Windows supports both the -new-tab and -new-window
options, so the special case is no longer necessary there. I have
tested this with Firefox 11.0 under Windows XP and Firefox 36.0.1
under MS-Windows 8.1.

See patch below. It should be pushed to the emacs-24 branch, I guess?

>From 3e3f9ade6aa13fbeb93ee2eee117ef8e04aec5d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <[email-masked]>
Date: Sat, 7 Mar 2015 11:47:56 +0100
Subject: [PATCH] browse-url-firefox: Remove MS-Windows special case.

* lisp/net/browse-url.el (browse-url-firefox): Remove MS-Windows
special case.
---
 lisp/ChangeLog         |  5 +++++
 lisp/net/browse-url.el | 17 +++++------------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e4e463..95ab6cc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-07  Ulrich Müller  <[email-masked]>
+
+	* net/browse-url.el (browse-url-firefox): Remove MS-Windows
+	special case.
+
 2015-03-07  Eli Zaretskii  <[email-masked]>
 
 	* dired.el (dired-delete-file): Doc fix.  (Bug#20021)
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 4819cdc..d82d447 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1117,11 +1117,7 @@ whenever a document would otherwise be loaded in a new window, it
 is loaded in a new tab in an existing window instead.
 
 Non-interactively, this uses the optional second argument NEW-WINDOW
-instead of `browse-url-new-window-flag'.
-
-On MS Windows, this ignores `browse-url-new-window-flag' and
-`browse-url-firefox-new-window-is-tab', as well as the NEW-WINDOW argument.
-It always uses a new window."
+instead of `browse-url-new-window-flag'."
   (interactive (browse-url-interactive-arg "URL: "))
   (setq url (browse-url-encode-url url))
   (let* ((process-environment (browse-url-process-environment)))
@@ -1130,13 +1126,10 @@ It always uses a new window."
            browse-url-firefox-program
            (append
             browse-url-firefox-arguments
-            ;; FIXME someone should check if this limitation
-            ;; still applies.
-            (unless (memq system-type '(windows-nt ms-dos))
-              (if (browse-url-maybe-new-window new-window)
-                  (if browse-url-firefox-new-window-is-tab
-                      '("-new-tab")
-                    '("-new-window"))))
+	    (if (browse-url-maybe-new-window new-window)
+		(if browse-url-firefox-new-window-is-tab
+		    '("-new-tab")
+		  '("-new-window")))
             (list url)))))
 
 ;;;###autoload
-- 
2.3.1