diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-07-14 11:37:42 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-07-14 11:37:42 +0200 |
| commit | 4e79f77635a80e0c25841ba15feb0e70c8824516 (patch) | |
| tree | 7f68cf7d809a10e6c2501fb3d9451047fb8da051 /lisp/url/url-http.el | |
| parent | e1d93302c29916e738552484b9363c5b9e77c5c1 (diff) | |
| parent | 5e47ec95118c06dd66cd488ad25775d801d75c0c (diff) | |
| download | emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.tar.gz emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.tar.bz2 emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.zip | |
Merge from origin/emacs-28
5e47ec9511 ; * lisp/url/url-http.el (url-http-parse-headers): Fix typo.
ba0871bef1 ; Fix typos: prefer American spelling
e3e7f31faa Adapt Tramp doc
# Conflicts:
# etc/NEWS
# etc/themes/modus-themes.el
# lisp/emacs-lisp/byte-opt.el
# test/lisp/so-long-tests/spelling-tests.el
Diffstat (limited to 'lisp/url/url-http.el')
| -rw-r--r-- | lisp/url/url-http.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 4e5d017036c..3d7d8779795 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -709,7 +709,7 @@ should be shown to the user." ;; gives the URI of the proxy. The recipient is expected ;; to repeat this single request via the proxy. 305 ;; responses MUST only be generated by origin servers. - (error "Redirection thru a proxy server not supported: %s" + (error "Redirection through a proxy server not supported: %s" redirect-uri)) (_ ;; Treat everything like '300' |