diff options
| author | Stefan Kangas | 2021-12-07 18:57:48 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2021-12-07 18:59:53 +0100 |
| commit | 1933cd5307e1b6c628d2123533e27fc2bc436fcc (patch) | |
| tree | b2aab332e16a714f808d7c9abaea7463680f4ec2 | |
| parent | b80d7568e410a2d2b76214b8ae5f0020d18dab46 (diff) | |
| download | emacs-1933cd5307e1b6c628d2123533e27fc2bc436fcc.tar.gz emacs-1933cd5307e1b6c628d2123533e27fc2bc436fcc.zip | |
Doc fix; Epiphany has been renamed to GNOME Web
* lisp/net/browse-url.el: Doc fix; Epiphany is called GNOME Web
since GNOME 3.4, released in 2012.
Ref: https://help.gnome.org/misc/release-notes/3.4/
| -rw-r--r-- | lisp/net/browse-url.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index cc7582e06a3..4ae56864c55 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | ;; browse-url-firefox Firefox Don't know (tried with 1.0.1) | 38 | ;; browse-url-firefox Firefox Don't know (tried with 1.0.1) |
| 39 | ;; browse-url-chrome Chrome 47.0.2526.111 | 39 | ;; browse-url-chrome Chrome 47.0.2526.111 |
| 40 | ;; browse-url-chromium Chromium 3.0 | 40 | ;; browse-url-chromium Chromium 3.0 |
| 41 | ;; browse-url-epiphany Epiphany Don't know | 41 | ;; browse-url-epiphany GNOME Web (Epiphany) Don't know |
| 42 | ;; browse-url-w3 w3 0 | 42 | ;; browse-url-w3 w3 0 |
| 43 | ;; browse-url-text-* Any text browser 0 | 43 | ;; browse-url-text-* Any text browser 0 |
| 44 | ;; browse-url-generic arbitrary | 44 | ;; browse-url-generic arbitrary |
| @@ -155,7 +155,7 @@ | |||
| 155 | (function-item :tag "Firefox" :value browse-url-firefox) | 155 | (function-item :tag "Firefox" :value browse-url-firefox) |
| 156 | (function-item :tag "Google Chrome" :value browse-url-chrome) | 156 | (function-item :tag "Google Chrome" :value browse-url-chrome) |
| 157 | (function-item :tag "Chromium" :value browse-url-chromium) | 157 | (function-item :tag "Chromium" :value browse-url-chromium) |
| 158 | (function-item :tag "Epiphany" :value browse-url-epiphany) | 158 | (function-item :tag "GNOME Web (Epiphany)" :value browse-url-epiphany) |
| 159 | (function-item :tag "Text browser in an xterm window" | 159 | (function-item :tag "Text browser in an xterm window" |
| 160 | :value browse-url-text-xterm) | 160 | :value browse-url-text-xterm) |
| 161 | (function-item :tag "Text browser in an Emacs window" | 161 | (function-item :tag "Text browser in an Emacs window" |
| @@ -353,15 +353,15 @@ Defaults to the value of `browse-url-galeon-arguments' at the time | |||
| 353 | (make-obsolete-variable 'browse-url-galeon-startup-arguments nil "25.1") | 353 | (make-obsolete-variable 'browse-url-galeon-startup-arguments nil "25.1") |
| 354 | 354 | ||
| 355 | (defcustom browse-url-epiphany-program "epiphany" | 355 | (defcustom browse-url-epiphany-program "epiphany" |
| 356 | "The name by which to invoke Epiphany." | 356 | "The name by which to invoke GNOME Web (Epiphany)." |
| 357 | :type 'string) | 357 | :type 'string) |
| 358 | 358 | ||
| 359 | (defcustom browse-url-epiphany-arguments nil | 359 | (defcustom browse-url-epiphany-arguments nil |
| 360 | "A list of strings to pass to Epiphany as arguments." | 360 | "A list of strings to pass to GNOME Web (Epiphany) as arguments." |
| 361 | :type '(repeat (string :tag "Argument"))) | 361 | :type '(repeat (string :tag "Argument"))) |
| 362 | 362 | ||
| 363 | (defcustom browse-url-epiphany-startup-arguments browse-url-epiphany-arguments | 363 | (defcustom browse-url-epiphany-startup-arguments browse-url-epiphany-arguments |
| 364 | "A list of strings to pass to Epiphany when it starts up. | 364 | "A list of strings to pass to GNOME Web (Epiphany) when it starts up. |
| 365 | Defaults to the value of `browse-url-epiphany-arguments' at the time | 365 | Defaults to the value of `browse-url-epiphany-arguments' at the time |
| 366 | `browse-url' is loaded." | 366 | `browse-url' is loaded." |
| 367 | :type '(repeat (string :tag "Argument"))) | 367 | :type '(repeat (string :tag "Argument"))) |
| @@ -1329,12 +1329,12 @@ used instead of `browse-url-new-window-flag'." | |||
| 1329 | (append browse-url-galeon-startup-arguments (list url)))))) | 1329 | (append browse-url-galeon-startup-arguments (list url)))))) |
| 1330 | 1330 | ||
| 1331 | (defun browse-url-epiphany (url &optional new-window) | 1331 | (defun browse-url-epiphany (url &optional new-window) |
| 1332 | "Ask the Epiphany WWW browser to load URL. | 1332 | "Ask the GNOME Web (Epiphany) WWW browser to load URL. |
| 1333 | Default to the URL around or before point. The strings in variable | 1333 | Default to the URL around or before point. The strings in variable |
| 1334 | `browse-url-epiphany-arguments' are also passed to Epiphany. | 1334 | `browse-url-epiphany-arguments' are also passed to GNOME Web. |
| 1335 | 1335 | ||
| 1336 | When called interactively, if variable `browse-url-new-window-flag' is | 1336 | When called interactively, if variable `browse-url-new-window-flag' is |
| 1337 | non-nil, load the document in a new Epiphany window, otherwise use a | 1337 | non-nil, load the document in a new GNOME Web window, otherwise use a |
| 1338 | random existing one. A non-nil interactive prefix argument reverses | 1338 | random existing one. A non-nil interactive prefix argument reverses |
| 1339 | the effect of `browse-url-new-window-flag'. | 1339 | the effect of `browse-url-new-window-flag'. |
| 1340 | 1340 | ||
| @@ -1366,10 +1366,10 @@ used instead of `browse-url-new-window-flag'." | |||
| 1366 | (function-put 'browse-url-epiphany 'browse-url-browser-kind 'external) | 1366 | (function-put 'browse-url-epiphany 'browse-url-browser-kind 'external) |
| 1367 | 1367 | ||
| 1368 | (defun browse-url-epiphany-sentinel (process url) | 1368 | (defun browse-url-epiphany-sentinel (process url) |
| 1369 | "Handle a change to the process communicating with Epiphany." | 1369 | "Handle a change to the process communicating with GNOME Web (Epiphany)." |
| 1370 | (or (eq (process-exit-status process) 0) | 1370 | (or (eq (process-exit-status process) 0) |
| 1371 | (let* ((process-environment (browse-url-process-environment))) | 1371 | (let* ((process-environment (browse-url-process-environment))) |
| 1372 | ;; Epiphany is not running - start it | 1372 | ;; GNOME Web is not running - start it |
| 1373 | (message "Starting %s..." browse-url-epiphany-program) | 1373 | (message "Starting %s..." browse-url-epiphany-program) |
| 1374 | (apply #'start-process (concat "epiphany " url) nil | 1374 | (apply #'start-process (concat "epiphany " url) nil |
| 1375 | browse-url-epiphany-program | 1375 | browse-url-epiphany-program |