From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ulrich Mueller Newsgroups: gmane.emacs.bugs Subject: bug#19921: [PATCH] browse-url-firefox: Remove MS-Windows special case. Date: Sat, 7 Mar 2015 12:16:23 +0100 Message-ID: <21754.56839.582479.848900@a1i15.kph.uni-mainz.de> References: <20150222.170113.1017436961048435194.ryo_on@yk.rim.or.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1425727041 5894 80.91.229.3 (7 Mar 2015 11:17:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 7 Mar 2015 11:17:21 +0000 (UTC) To: 19921@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Mar 07 12:17:10 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YUCjF-0003gb-MV for geb-bug-gnu-emacs@m.gmane.org; Sat, 07 Mar 2015 12:17:09 +0100 Original-Received: from localhost ([::1]:34115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YUCjF-00039Z-0o for geb-bug-gnu-emacs@m.gmane.org; Sat, 07 Mar 2015 06:17:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YUCjB-00039T-Py for bug-gnu-emacs@gnu.org; Sat, 07 Mar 2015 06:17:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YUCj8-0003Bn-D0 for bug-gnu-emacs@gnu.org; Sat, 07 Mar 2015 06:17:05 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:39587) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YUCj8-0003Bh-A5 for bug-gnu-emacs@gnu.org; Sat, 07 Mar 2015 06:17:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YUCj7-0001g9-T3 for bug-gnu-emacs@gnu.org; Sat, 07 Mar 2015 06:17:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <20150222.170113.1017436961048435194.ryo_on@yk.rim.or.jp> Resent-From: Ulrich Mueller Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 07 Mar 2015 11:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19921 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 19921-submit@debbugs.gnu.org id=B19921.14257269936407 (code B ref 19921); Sat, 07 Mar 2015 11:17:01 +0000 Original-Received: (at 19921) by debbugs.gnu.org; 7 Mar 2015 11:16:33 +0000 Original-Received: from localhost ([127.0.0.1]:38155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YUCie-0001fH-Nr for submit@debbugs.gnu.org; Sat, 07 Mar 2015 06:16:33 -0500 Original-Received: from a1www.kph.uni-mainz.de ([134.93.134.1]:36322) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YUCic-0001f4-MR for 19921@debbugs.gnu.org; Sat, 07 Mar 2015 06:16:31 -0500 Original-Received: from a1i15.kph.uni-mainz.de (a1i15.kph.uni-mainz.de [134.93.134.92]) by a1www.kph.uni-mainz.de (8.14.9/8.14.7) with ESMTP id t27BGO4l026818 for <19921@debbugs.gnu.org>; Sat, 7 Mar 2015 12:16:24 +0100 Original-Received: from a1i15.kph.uni-mainz.de (localhost [127.0.0.1]) by a1i15.kph.uni-mainz.de (8.14.8/8.14.2) with ESMTP id t27BGO4K025924; Sat, 7 Mar 2015 12:16:24 +0100 Original-Received: (from ulm@localhost) by a1i15.kph.uni-mainz.de (8.14.8/8.14.8/Submit) id t27BGNxp025920; Sat, 7 Mar 2015 12:16:23 +0100 X-Mailer: VM 8.2.0b under 24.3.1 (x86_64-pc-linux-gnu) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:100234 Archived-At: 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?= 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 + + * net/browse-url.el (browse-url-firefox): Remove MS-Windows + special case. + 2015-03-07 Eli Zaretskii * 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