diff options
| author | Lars Ingebrigtsen | 2019-07-09 03:44:06 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-07-09 03:44:13 +0200 |
| commit | 0990ae5a8b769a0db7a9c9abd05bd5d89db44d45 (patch) | |
| tree | d42e57f721bc69737ec2d9432159ae78a3c3e017 | |
| parent | 84047666a7e04dab959ab4e6d471d2677bc31dac (diff) | |
| download | emacs-0990ae5a8b769a0db7a9c9abd05bd5d89db44d45.tar.gz emacs-0990ae5a8b769a0db7a9c9abd05bd5d89db44d45.zip | |
Don't set url-mime-charset-string from set-language-environment
* lisp/url/url-vars.el (url-set-mime-charset-string): Make
obsolete and don't add to set-language-environment-hook
(bug#36268). If you loaded url-vars before calling
set-language-environment, you would suddenly get an unusable long
url-mime-charset-string.
| -rw-r--r-- | lisp/url/url-vars.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el index 28f876554bb..134404c9984 100644 --- a/lisp/url/url-vars.el +++ b/lisp/url/url-vars.el | |||
| @@ -272,9 +272,8 @@ The MIME charset corresponding to the most preferred coding system is | |||
| 272 | given priority 1 and the rest are given priority 0.5.") | 272 | given priority 1 and the rest are given priority 0.5.") |
| 273 | 273 | ||
| 274 | (defun url-set-mime-charset-string () | 274 | (defun url-set-mime-charset-string () |
| 275 | (declare (obsolete nil "27.1")) | ||
| 275 | (setq url-mime-charset-string (url-mime-charset-string))) | 276 | (setq url-mime-charset-string (url-mime-charset-string))) |
| 276 | ;; Regenerate if the language environment changes. | ||
| 277 | (add-hook 'set-language-environment-hook 'url-set-mime-charset-string) | ||
| 278 | 277 | ||
| 279 | ;; Fixme: set from the locale. | 278 | ;; Fixme: set from the locale. |
| 280 | (defcustom url-mime-language-string nil | 279 | (defcustom url-mime-language-string nil |