diff options
| author | Yuuki Harano | 2020-12-21 01:53:07 +0900 |
|---|---|---|
| committer | Yuuki Harano | 2020-12-21 01:53:07 +0900 |
| commit | 565d8f57d349c19d9bbb5d5d5fdacf3c70b85d42 (patch) | |
| tree | 5a25406b9f4ff091cb6856e857d2857bb3e631e4 /lisp/url | |
| parent | a44cd7c88121bb0e04bdf13d73e15f085cf3b085 (diff) | |
| parent | 87b82a1969edf80d3bd4781454ec9fc968773a6d (diff) | |
| download | emacs-565d8f57d349c19d9bbb5d5d5fdacf3c70b85d42.tar.gz emacs-565d8f57d349c19d9bbb5d5d5fdacf3c70b85d42.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/url')
| -rw-r--r-- | lisp/url/url-proxy.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el index 698a87098ba..ad04a2d94a3 100644 --- a/lisp/url/url-proxy.el +++ b/lisp/url/url-proxy.el | |||
| @@ -59,7 +59,7 @@ | |||
| 59 | ((string-match "^socks +" proxy) | 59 | ((string-match "^socks +" proxy) |
| 60 | (concat "socks://" (substring proxy (match-end 0)))) | 60 | (concat "socks://" (substring proxy (match-end 0)))) |
| 61 | (t | 61 | (t |
| 62 | (display-warning 'url (format "Unknown proxy directive: %s" proxy) 'critical) | 62 | (display-warning 'url (format "Unknown proxy directive: %s" proxy) :error) |
| 63 | nil)))) | 63 | nil)))) |
| 64 | 64 | ||
| 65 | (autoload 'url-http "url-http") | 65 | (autoload 'url-http "url-http") |