diff options
| author | Stefan Kangas | 2021-12-07 19:31:21 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2021-12-07 19:36:23 +0100 |
| commit | 9013e4ea194d0a41c9577cccef177e98dbe1268e (patch) | |
| tree | 17035a18c53d063ce260487bfb7c5338589a4d71 | |
| parent | 9168abd7f52a0bdc42fd09617a9e1cecb7aaee89 (diff) | |
| download | emacs-9013e4ea194d0a41c9577cccef177e98dbe1268e.tar.gz emacs-9013e4ea194d0a41c9577cccef177e98dbe1268e.zip | |
browse-url: Remove support for Galeon
* lisp/net/browse-url.el (browse-url-galeon-program)
(browse-url-galeon-arguments)
(browse-url-galeon-startup-arguments)
(browse-url-galeon-new-window-is-tab, browse-url-galeon)
(browse-url-galeon-sentinel): Delete, thus removing support for the long
defunct Galeon web browser.
* etc/NEWS: Announce its removal.
| -rw-r--r-- | etc/NEWS | 6 | ||||
| -rw-r--r-- | lisp/net/browse-url.el | 79 |
2 files changed, 6 insertions, 79 deletions
| @@ -686,10 +686,16 @@ will abbreviate the user's home directory, for example by abbreviating | |||
| 686 | 686 | ||
| 687 | ** Browse URL | 687 | ** Browse URL |
| 688 | 688 | ||
| 689 | --- | ||
| 689 | *** Support for the Netscape web browser has been removed. | 690 | *** Support for the Netscape web browser has been removed. |
| 690 | This support has been obsolete since Emacs 25.1. The final version of | 691 | This support has been obsolete since Emacs 25.1. The final version of |
| 691 | the Netscape web browser was released in February, 2008. | 692 | the Netscape web browser was released in February, 2008. |
| 692 | 693 | ||
| 694 | --- | ||
| 695 | *** Support for the Galeon web browser has been removed. | ||
| 696 | This support has been obsolete since Emacs 25.1. The final version of | ||
| 697 | the Galeon web browser was released in September, 2008. | ||
| 698 | |||
| 693 | 699 | ||
| 694 | * New Modes and Packages in Emacs 29.1 | 700 | * New Modes and Packages in Emacs 29.1 |
| 695 | 701 | ||
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 990bc41d984..e30c36ea4d5 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el | |||
| @@ -307,26 +307,6 @@ Defaults to the value of `browse-url-firefox-arguments' at the time | |||
| 307 | :type '(repeat (string :tag "Argument")) | 307 | :type '(repeat (string :tag "Argument")) |
| 308 | :version "24.1") | 308 | :version "24.1") |
| 309 | 309 | ||
| 310 | (defcustom browse-url-galeon-program "galeon" | ||
| 311 | "The name by which to invoke Galeon." | ||
| 312 | :type 'string) | ||
| 313 | |||
| 314 | (make-obsolete-variable 'browse-url-galeon-program nil "25.1") | ||
| 315 | |||
| 316 | (defcustom browse-url-galeon-arguments nil | ||
| 317 | "A list of strings to pass to Galeon as arguments." | ||
| 318 | :type '(repeat (string :tag "Argument"))) | ||
| 319 | |||
| 320 | (make-obsolete-variable 'browse-url-galeon-arguments nil "25.1") | ||
| 321 | |||
| 322 | (defcustom browse-url-galeon-startup-arguments browse-url-galeon-arguments | ||
| 323 | "A list of strings to pass to Galeon when it starts up. | ||
| 324 | Defaults to the value of `browse-url-galeon-arguments' at the time | ||
| 325 | `browse-url' is loaded." | ||
| 326 | :type '(repeat (string :tag "Argument"))) | ||
| 327 | |||
| 328 | (make-obsolete-variable 'browse-url-galeon-startup-arguments nil "25.1") | ||
| 329 | |||
| 330 | (defcustom browse-url-epiphany-program "epiphany" | 310 | (defcustom browse-url-epiphany-program "epiphany" |
| 331 | "The name by which to invoke Epiphany." | 311 | "The name by which to invoke Epiphany." |
| 332 | :type 'string) | 312 | :type 'string) |
| @@ -379,14 +359,6 @@ If non-nil, then open the URL in a new buffer rather than a new window if | |||
| 379 | 359 | ||
| 380 | (make-obsolete-variable 'browse-url-conkeror-new-window-is-buffer nil "28.1") | 360 | (make-obsolete-variable 'browse-url-conkeror-new-window-is-buffer nil "28.1") |
| 381 | 361 | ||
| 382 | (defcustom browse-url-galeon-new-window-is-tab nil | ||
| 383 | "Whether to open up new windows in a tab or a new window. | ||
| 384 | If non-nil, then open the URL in a new tab rather than a new window if | ||
| 385 | `browse-url-galeon' is asked to open it in a new window." | ||
| 386 | :type 'boolean) | ||
| 387 | |||
| 388 | (make-obsolete-variable 'browse-url-galeon-new-window-is-tab nil "25.1") | ||
| 389 | |||
| 390 | (defcustom browse-url-epiphany-new-window-is-tab nil | 362 | (defcustom browse-url-epiphany-new-window-is-tab nil |
| 391 | "Whether to open up new windows in a tab or a new window. | 363 | "Whether to open up new windows in a tab or a new window. |
| 392 | If non-nil, then open the URL in a new tab rather than a new window if | 364 | If non-nil, then open the URL in a new tab rather than a new window if |
| @@ -1007,7 +979,6 @@ instead of `browse-url-new-window-flag'." | |||
| 1007 | ((executable-find browse-url-mozilla-program) 'browse-url-mozilla) | 979 | ((executable-find browse-url-mozilla-program) 'browse-url-mozilla) |
| 1008 | ((executable-find browse-url-firefox-program) 'browse-url-firefox) | 980 | ((executable-find browse-url-firefox-program) 'browse-url-firefox) |
| 1009 | ((executable-find browse-url-chromium-program) 'browse-url-chromium) | 981 | ((executable-find browse-url-chromium-program) 'browse-url-chromium) |
| 1010 | ;;; ((executable-find browse-url-galeon-program) 'browse-url-galeon) | ||
| 1011 | ((executable-find browse-url-kde-program) 'browse-url-kde) | 982 | ((executable-find browse-url-kde-program) 'browse-url-kde) |
| 1012 | ((executable-find browse-url-chrome-program) 'browse-url-chrome) | 983 | ((executable-find browse-url-chrome-program) 'browse-url-chrome) |
| 1013 | ((executable-find browse-url-webpositive-program) 'browse-url-webpositive) | 984 | ((executable-find browse-url-webpositive-program) 'browse-url-webpositive) |
| @@ -1162,56 +1133,6 @@ The optional argument NEW-WINDOW is not used." | |||
| 1162 | 1133 | ||
| 1163 | (function-put 'browse-url-chrome 'browse-url-browser-kind 'external) | 1134 | (function-put 'browse-url-chrome 'browse-url-browser-kind 'external) |
| 1164 | 1135 | ||
| 1165 | ;;;###autoload | ||
| 1166 | (defun browse-url-galeon (url &optional new-window) | ||
| 1167 | "Ask the Galeon WWW browser to load URL. | ||
| 1168 | Default to the URL around or before point. The strings in variable | ||
| 1169 | `browse-url-galeon-arguments' are also passed to Galeon. | ||
| 1170 | |||
| 1171 | When called interactively, if variable `browse-url-new-window-flag' is | ||
| 1172 | non-nil, load the document in a new Galeon window, otherwise use a | ||
| 1173 | random existing one. A non-nil interactive prefix argument reverses | ||
| 1174 | the effect of `browse-url-new-window-flag'. | ||
| 1175 | |||
| 1176 | If `browse-url-galeon-new-window-is-tab' is non-nil, then whenever a | ||
| 1177 | document would otherwise be loaded in a new window, it is loaded in a | ||
| 1178 | new tab in an existing window instead. | ||
| 1179 | |||
| 1180 | When called non-interactively, optional second argument NEW-WINDOW is | ||
| 1181 | used instead of `browse-url-new-window-flag'." | ||
| 1182 | (declare (obsolete nil "25.1")) | ||
| 1183 | (interactive (browse-url-interactive-arg "URL: ")) | ||
| 1184 | (setq url (browse-url-encode-url url)) | ||
| 1185 | (let* ((process-environment (browse-url-process-environment)) | ||
| 1186 | (process (apply #'start-process | ||
| 1187 | (concat "galeon " url) | ||
| 1188 | nil | ||
| 1189 | browse-url-galeon-program | ||
| 1190 | (append | ||
| 1191 | browse-url-galeon-arguments | ||
| 1192 | (if (browse-url-maybe-new-window new-window) | ||
| 1193 | (if browse-url-galeon-new-window-is-tab | ||
| 1194 | '("--new-tab") | ||
| 1195 | '("--new-window" "--noraise")) | ||
| 1196 | '("--existing")) | ||
| 1197 | (list url))))) | ||
| 1198 | (set-process-sentinel process | ||
| 1199 | (lambda (process _change) | ||
| 1200 | (browse-url-galeon-sentinel process url))))) | ||
| 1201 | |||
| 1202 | (function-put 'browse-url-galeon 'browse-url-browser-kind 'external) | ||
| 1203 | |||
| 1204 | (defun browse-url-galeon-sentinel (process url) | ||
| 1205 | "Handle a change to the process communicating with Galeon." | ||
| 1206 | (declare (obsolete nil "25.1")) | ||
| 1207 | (or (eq (process-exit-status process) 0) | ||
| 1208 | (let* ((process-environment (browse-url-process-environment))) | ||
| 1209 | ;; Galeon is not running - start it | ||
| 1210 | (message "Starting %s..." browse-url-galeon-program) | ||
| 1211 | (apply #'start-process (concat "galeon " url) nil | ||
| 1212 | browse-url-galeon-program | ||
| 1213 | (append browse-url-galeon-startup-arguments (list url)))))) | ||
| 1214 | |||
| 1215 | (defun browse-url-epiphany (url &optional new-window) | 1136 | (defun browse-url-epiphany (url &optional new-window) |
| 1216 | "Ask the Epiphany WWW browser to load URL. | 1137 | "Ask the Epiphany WWW browser to load URL. |
| 1217 | Default to the URL around or before point. The strings in variable | 1138 | Default to the URL around or before point. The strings in variable |