diff options
Diffstat (limited to 'lisp')
| -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 @@ ;; browse-url-firefox Firefox Don't know (tried with 1.0.1) ;; browse-url-chrome Chrome 47.0.2526.111 ;; browse-url-chromium Chromium 3.0 -;; browse-url-epiphany Epiphany Don't know +;; browse-url-epiphany GNOME Web (Epiphany) Don't know ;; browse-url-w3 w3 0 ;; browse-url-text-* Any text browser 0 ;; browse-url-generic arbitrary @@ -155,7 +155,7 @@ (function-item :tag "Firefox" :value browse-url-firefox) (function-item :tag "Google Chrome" :value browse-url-chrome) (function-item :tag "Chromium" :value browse-url-chromium) - (function-item :tag "Epiphany" :value browse-url-epiphany) + (function-item :tag "GNOME Web (Epiphany)" :value browse-url-epiphany) (function-item :tag "Text browser in an xterm window" :value browse-url-text-xterm) (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 (make-obsolete-variable 'browse-url-galeon-startup-arguments nil "25.1") (defcustom browse-url-epiphany-program "epiphany" - "The name by which to invoke Epiphany." + "The name by which to invoke GNOME Web (Epiphany)." :type 'string) (defcustom browse-url-epiphany-arguments nil - "A list of strings to pass to Epiphany as arguments." + "A list of strings to pass to GNOME Web (Epiphany) as arguments." :type '(repeat (string :tag "Argument"))) (defcustom browse-url-epiphany-startup-arguments browse-url-epiphany-arguments - "A list of strings to pass to Epiphany when it starts up. + "A list of strings to pass to GNOME Web (Epiphany) when it starts up. Defaults to the value of `browse-url-epiphany-arguments' at the time `browse-url' is loaded." :type '(repeat (string :tag "Argument"))) @@ -1329,12 +1329,12 @@ used instead of `browse-url-new-window-flag'." (append browse-url-galeon-startup-arguments (list url)))))) (defun browse-url-epiphany (url &optional new-window) - "Ask the Epiphany WWW browser to load URL. + "Ask the GNOME Web (Epiphany) WWW browser to load URL. Default to the URL around or before point. The strings in variable -`browse-url-epiphany-arguments' are also passed to Epiphany. +`browse-url-epiphany-arguments' are also passed to GNOME Web. When called interactively, if variable `browse-url-new-window-flag' is -non-nil, load the document in a new Epiphany window, otherwise use a +non-nil, load the document in a new GNOME Web window, otherwise use a random existing one. A non-nil interactive prefix argument reverses the effect of `browse-url-new-window-flag'. @@ -1366,10 +1366,10 @@ used instead of `browse-url-new-window-flag'." (function-put 'browse-url-epiphany 'browse-url-browser-kind 'external) (defun browse-url-epiphany-sentinel (process url) - "Handle a change to the process communicating with Epiphany." + "Handle a change to the process communicating with GNOME Web (Epiphany)." (or (eq (process-exit-status process) 0) (let* ((process-environment (browse-url-process-environment))) - ;; Epiphany is not running - start it + ;; GNOME Web is not running - start it (message "Starting %s..." browse-url-epiphany-program) (apply #'start-process (concat "epiphany " url) nil browse-url-epiphany-program |