Skip to content

Commit 510aa75

Browse files
committed
Stop using message-default-charset (Bug#35370)
In 2016-02-14 "Remove compat code for older Emacsen", message-default-charset was obsoleted, and a couple of uses were removed, but others were left behind. * lisp/gnus/message.el (message-send-mail) (message-send-news, message-do-fcc) (message-encode-message-body): * lisp/gnus/mml.el (mml-to-mime): Stop using message-default-charset.
1 parent 8ce5e37 commit 510aa75

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

lisp/gnus/message.el

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4588,8 +4588,7 @@ This function could be useful in `message-setup-hook'."
45884588
(message-generate-headers '(Lines)))
45894589
;; Remove some headers.
45904590
(message-remove-header message-ignored-mail-headers t)
4591-
(let ((mail-parse-charset message-default-charset))
4592-
(mail-encode-encoded-word-buffer)))
4591+
(mail-encode-encoded-word-buffer))
45934592
(goto-char (point-max))
45944593
;; require one newline at the end.
45954594
(or (= (preceding-char) ?\n)
@@ -4962,8 +4961,7 @@ Otherwise, generate and save a value for `canlock-password' first."
49624961
(message-generate-headers '(Lines)))
49634962
;; Remove some headers.
49644963
(message-remove-header message-ignored-news-headers t)
4965-
(let ((mail-parse-charset message-default-charset))
4966-
(mail-encode-encoded-word-buffer)))
4964+
(mail-encode-encoded-word-buffer))
49674965
(goto-char (point-max))
49684966
;; require one newline at the end.
49694967
(or (= (preceding-char) ?\n)
@@ -5441,8 +5439,7 @@ The result is a fixnum."
54415439
(while (setq file (message-fetch-field "fcc" t))
54425440
(push file list)
54435441
(message-remove-header "fcc" nil t))
5444-
(let ((mail-parse-charset message-default-charset)
5445-
(rfc2047-header-encoding-alist
5442+
(let ((rfc2047-header-encoding-alist
54465443
(cons '("Newsgroups" . default)
54475444
rfc2047-header-encoding-alist)))
54485445
(mail-encode-encoded-word-buffer)))
@@ -8101,9 +8098,7 @@ regexp VARSTR."
81018098

81028099
(defun message-encode-message-body ()
81038100
(unless message-inhibit-body-encoding
8104-
(let ((mail-parse-charset (or mail-parse-charset
8105-
message-default-charset))
8106-
(case-fold-search t)
8101+
(let ((case-fold-search t)
81078102
lines content-type-p)
81088103
(message-goto-body)
81098104
(save-restriction

lisp/gnus/mml.el

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848

4949
(defvar gnus-article-mime-handles)
5050
(defvar gnus-newsrc-hashtb)
51-
(defvar message-default-charset)
5251
(defvar message-deletable-headers)
5352
(defvar message-options)
5453
(defvar message-posting-charset)
@@ -1015,8 +1014,7 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
10151014
;; Skip past any From_ headers.
10161015
(while (looking-at "From ")
10171016
(forward-line 1))
1018-
(let ((mail-parse-charset message-default-charset))
1019-
(mail-encode-encoded-word-buffer)))
1017+
(mail-encode-encoded-word-buffer))
10201018
(message-encode-message-body))
10211019

10221020
(defun mml-insert-mime (handle &optional no-markup)

0 commit comments

Comments
 (0)