diff options
| author | Oscar Fuentes | 2015-03-06 17:18:45 +0100 |
|---|---|---|
| committer | Oscar Fuentes | 2015-03-06 17:18:45 +0100 |
| commit | 20c6b227ea69b9cd47f92d1a7e0935312e8ce83c (patch) | |
| tree | c002a32192a074e8c3aad41512466eddca851f36 | |
| parent | bfebebbc72c6a6ea375c6e8ed7f8641b25439770 (diff) | |
| download | emacs-20c6b227ea69b9cd47f92d1a7e0935312e8ce83c.tar.gz emacs-20c6b227ea69b9cd47f92d1a7e0935312e8ce83c.zip | |
browse-url-firefox: removed MS-Windows limitations
net/browse-url.el (browse-url-firefox): Removed outdated
MS-Windows limitations.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/browse-url.el | 17 |
2 files changed, 10 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index edea71cda52..c81ab9b6d22 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2015-03-06 Oscar Fuentes <ofv@wanadoo.es> | ||
| 2 | |||
| 3 | * net/browse-url.el (browse-url-firefox): Removed outdated | ||
| 4 | MS-Windows limitations. | ||
| 5 | |||
| 1 | 2015-03-06 Thomas Fitzsimmons <fitzsim@fitzsim.org> | 6 | 2015-03-06 Thomas Fitzsimmons <fitzsim@fitzsim.org> |
| 2 | 7 | ||
| 3 | * net/eudcb-ldap.el (eudc-ldap-cleanup-record-simple): Mark as | 8 | * 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 4c8ebf01588..5e61c094c2e 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 | |||
| 1117 | is loaded in a new tab in an existing window instead. | 1117 | is loaded in a new tab in an existing window instead. |
| 1118 | 1118 | ||
| 1119 | Non-interactively, this uses the optional second argument NEW-WINDOW | 1119 | Non-interactively, this uses the optional second argument NEW-WINDOW |
| 1120 | instead of `browse-url-new-window-flag'. | 1120 | instead of `browse-url-new-window-flag'." |
| 1121 | |||
| 1122 | On MS Windows, this ignores `browse-url-new-window-flag' and | ||
| 1123 | `browse-url-firefox-new-window-is-tab', as well as the NEW-WINDOW argument. | ||
| 1124 | It always uses a new window." | ||
| 1125 | (interactive (browse-url-interactive-arg "URL: ")) | 1121 | (interactive (browse-url-interactive-arg "URL: ")) |
| 1126 | (setq url (browse-url-encode-url url)) | 1122 | (setq url (browse-url-encode-url url)) |
| 1127 | (let* ((process-environment (browse-url-process-environment))) | 1123 | (let* ((process-environment (browse-url-process-environment))) |
| @@ -1130,13 +1126,10 @@ It always uses a new window." | |||
| 1130 | browse-url-firefox-program | 1126 | browse-url-firefox-program |
| 1131 | (append | 1127 | (append |
| 1132 | browse-url-firefox-arguments | 1128 | browse-url-firefox-arguments |
| 1133 | ;; FIXME someone should check if this limitation | 1129 | (if (browse-url-maybe-new-window new-window) |
| 1134 | ;; still applies. | 1130 | (if browse-url-firefox-new-window-is-tab |
| 1135 | (unless (memq system-type '(windows-nt ms-dos)) | 1131 | '("-new-tab") |
| 1136 | (if (browse-url-maybe-new-window new-window) | 1132 | '("-new-window"))) |
| 1137 | (if browse-url-firefox-new-window-is-tab | ||
| 1138 | '("-new-tab") | ||
| 1139 | '("-new-window")))) | ||
| 1140 | (list url))))) | 1133 | (list url))))) |
| 1141 | 1134 | ||
| 1142 | ;;;###autoload | 1135 | ;;;###autoload |