From 20c6b227ea69b9cd47f92d1a7e0935312e8ce83c Mon Sep 17 00:00:00 2001
From: Oscar Fuentes <ofv@wanadoo.es>
Date: Fri, 6 Mar 2015 17:18:45 +0100
Subject: [PATCH] browse-url-firefox: removed MS-Windows limitations

net/browse-url.el (browse-url-firefox): Removed outdated
MS-Windows limitations.
---
 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 edea71cda5..c81ab9b6d2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-06  Oscar Fuentes  <ofv@wanadoo.es>
+
+	* net/browse-url.el (browse-url-firefox): Removed outdated
+	MS-Windows limitations.
+
 2015-03-06  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
 
 	* net/eudcb-ldap.el (eudc-ldap-cleanup-record-simple): Mark as
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 4c8ebf0158..5e61c094c2 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.39.2