procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

browse-url-with-browser-kind: Improve browser function selection

Browse source 
In order to find an appropriate browser function for the given
kind, first the browser handler lists are consulted.  If no
handler is found, the `browse-url-browser-function',
`browse-url-secondary-browser-function`,
`browse-url-default-browser' and `eww' are tried in that order
until a browser function with a matching kind is found.  This
way the user customization of `browse-url-browser-function' and
`browse-url-secondary-browser-function` is respected by
`browse-url-with-browser-kind'.
* lisp/net/browse-url.el (browse-url-with-browser-kind): Try the
browser functions in the aforementioned order.  (Bug#74820)
This commit is contained in:
Daniel Mendler 2024-12-12 12:15:10 +01:00 • committed by Eli Zaretskii
parent 40145ba971
commit 0f645b92ed
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lisp/net/browse-url.el
View file

@ -974,7 +974,13 @@ Optional prefix argument ARG non-nil inverts the value of the option
;;;###autoload
(defun browse-url-with-browser-kind (kind url &optional arg)
"Browse URL with a browser of the given browser KIND.
KIND is either `internal' or `external'.
KIND is either `internal' or `external'. In order to find an
appropriate browser for the given KIND, first the `browse-url-handlers'
and `browse-url-default-handlers' lists are consulted. If no handler is
found, the functions `browse-url-browser-function',
`browse-url-secondary-browser-function', `browse-url-default-browser'
and `eww' are tried in that order.
When called interactively, the default browser kind is the
opposite of the browser kind of `browse-url-browser-function'."
@ -994,9 +1000,14 @@ opposite of the browser kind of `browse-url-browser-function'."
(cons k url-arg)))
(let ((function (browse-url-select-handler url kind)))
(unless function
(setq function (if (eq kind 'external)
#'browse-url-default-browser
#'eww)))
(setq function
(seq-find
(lambda (fun)
(eq kind (browse-url--browser-kind fun url)))
(list browse-url-browser-function
browse-url-secondary-browser-function
#'browse-url-default-browser
#'eww))))
(funcall function url arg)))
;;;###autoload