diff options
| author | Lars Ingebrigtsen | 2019-08-23 06:00:36 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-08-23 06:00:36 +0200 |
| commit | a179209678f009e72f7d28a80e026afaa3076d1d (patch) | |
| tree | d5aeff53388ac97aa0ee19f3036c6619ac2a296e | |
| parent | baae65d918e7f4c1f47057bc4b5f0302c3e47f38 (diff) | |
| download | emacs-a179209678f009e72f7d28a80e026afaa3076d1d.tar.gz emacs-a179209678f009e72f7d28a80e026afaa3076d1d.zip | |
Fix interaction between url-handler-mode and browse-url
* lisp/net/browse-url.el (browse-url): Don't expand any URLs (like
"man:") that have a scheme when using `url-handler-mode' (bug#37056).
| -rw-r--r-- | lisp/net/browse-url.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 3151dae0aa2..87a8248854f 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el | |||
| @@ -781,7 +781,9 @@ as ARGS." | |||
| 781 | (interactive (browse-url-interactive-arg "URL: ")) | 781 | (interactive (browse-url-interactive-arg "URL: ")) |
| 782 | (unless (called-interactively-p 'interactive) | 782 | (unless (called-interactively-p 'interactive) |
| 783 | (setq args (or args (list browse-url-new-window-flag)))) | 783 | (setq args (or args (list browse-url-new-window-flag)))) |
| 784 | (when (and url-handler-mode (not (file-name-absolute-p url))) | 784 | (when (and url-handler-mode |
| 785 | (not (file-name-absolute-p url)) | ||
| 786 | (not (string-match "\\`[a-z]+:" url))) | ||
| 785 | (setq url (expand-file-name url))) | 787 | (setq url (expand-file-name url))) |
| 786 | (let ((process-environment (copy-sequence process-environment)) | 788 | (let ((process-environment (copy-sequence process-environment)) |
| 787 | (function (or (and (string-match "\\`mailto:" url) | 789 | (function (or (and (string-match "\\`mailto:" url) |