Merge from origin/emacs-28

ce5bca4913 Document native-comp-async-report-warning-errors more
1933cd5307 Doc fix; Epiphany has been renamed to GNOME Web
b80d7568e4 * lisp/dired-aux.el (dired-check-process): Doc fix.  (Bug#...
0f30227f97 ; * lisp/net/browse-url.el (browse-url-epiphany): Fix typo.
d34009db66 Remove dead link from newsticker

# Conflicts:
#	lisp/net/browse-url.el

diff --cc lisp/dired-aux.el
Simple merge

diff --cc lisp/net/browse-url.el
index d317256f06d345cc30c1e91bbe0c8f0c31ca1576,4ae56864c550bdc68c4287c727378147a6140606..2be9c7c025c9a3375f6435dc2a822fac54f3aec4
--- 1/lisp/net/browse-url.el
--- 2/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@@ -38,8 -38,7 +38,8 @@@
  ;; 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-webpositive             WebPositive 1.2-alpha (Haiku R1/beta3)
  ;; browse-url-w3                      w3          0
  ;; browse-url-text-*                Any text browser     0
  ;; browse-url-generic                 arbitrary
@@@ -156,8 -155,7 +156,8 @@@
      (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 "WebPositive" :value browse-url-webpositive)
      (function-item :tag "Text browser in an xterm window"
                   :value browse-url-text-xterm)
      (function-item :tag "Text browser in an Emacs window"
@@@ -304,8 -332,28 +304,8 @@@ Defaults to the value of `browse-url-fi
    :type '(repeat (string :tag "Argument"))
    :version "24.1")
  
 -(defcustom browse-url-galeon-program "galeon"
 -  "The name by which to invoke Galeon."
 -  :type 'string)
 -
 -(make-obsolete-variable 'browse-url-galeon-program nil "25.1")
 -
 -(defcustom browse-url-galeon-arguments nil
 -  "A list of strings to pass to Galeon as arguments."
 -  :type '(repeat (string :tag "Argument")))
 -
 -(make-obsolete-variable 'browse-url-galeon-arguments nil "25.1")
 -
 -(defcustom browse-url-galeon-startup-arguments browse-url-galeon-arguments
 -  "A list of strings to pass to Galeon when it starts up.
 -Defaults to the value of `browse-url-galeon-arguments' at the time
 -`browse-url' is loaded."
 -  :type '(repeat (string :tag "Argument")))
 -
 -(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
@@@ -1130,13 -1278,63 +1130,13 @@@ The optional argument NEW-WINDOW is no
  
  (function-put 'browse-url-chrome 'browse-url-browser-kind 'external)
  
 -;;;###autoload
 -(defun browse-url-galeon (url &optional new-window)
 -  "Ask the Galeon WWW browser to load URL.
 -Default to the URL around or before point.  The strings in variable
 -`browse-url-galeon-arguments' are also passed to Galeon.
 -
 -When called interactively, if variable `browse-url-new-window-flag' is
 -non-nil, load the document in a new Galeon window, otherwise use a
 -random existing one.  A non-nil interactive prefix argument reverses
 -the effect of `browse-url-new-window-flag'.
 -
 -If `browse-url-galeon-new-window-is-tab' is non-nil, then whenever a
 -document would otherwise be loaded in a new window, it is loaded in a
 -new tab in an existing window instead.
 -
 -When called non-interactively, optional second argument NEW-WINDOW is
 -used instead of `browse-url-new-window-flag'."
 -  (declare (obsolete nil "25.1"))
 -  (interactive (browse-url-interactive-arg "URL: "))
 -  (setq url (browse-url-encode-url url))
 -  (let* ((process-environment (browse-url-process-environment))
 -         (process (apply #'start-process
 -                       (concat "galeon " url)
 -                       nil
 -                       browse-url-galeon-program
 -                       (append
 -                        browse-url-galeon-arguments
 -                          (if (browse-url-maybe-new-window new-window)
 -                            (if browse-url-galeon-new-window-is-tab
 -                                '("--new-tab")
 -                              '("--new-window" "--noraise"))
 -                            '("--existing"))
 -                          (list url)))))
 -    (set-process-sentinel process
 -                        (lambda (process _change)
 -                          (browse-url-galeon-sentinel process url)))))
 -
 -(function-put 'browse-url-galeon 'browse-url-browser-kind 'external)
 -
 -(defun browse-url-galeon-sentinel (process url)
 -  "Handle a change to the process communicating with Galeon."
 -  (declare (obsolete nil "25.1"))
 -  (or (eq (process-exit-status process) 0)
 -      (let* ((process-environment (browse-url-process-environment)))
 -      ;; Galeon is not running - start it
 -      (message "Starting %s..." browse-url-galeon-program)
 -      (apply #'start-process (concat "galeon " url) nil
 -             browse-url-galeon-program
 -             (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-galeon-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'.
  

diff --cc lisp/net/newst-backend.el
Simple merge