From: Noam Postavsky <npostavs@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
david@tethera.net, notmuch@notmuchmail.org,
35370@debbugs.gnu.org
Subject: Re: bug#35370: notmuch-emacs: avoiding deprecated message-default-charset
Date: Tue, 07 May 2019 08:26:59 -0400 [thread overview]
Message-ID: <87d0kulab0.fsf@gmail.com> (raw)
In-Reply-To: <83k1fm8s7d.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 22 Apr 2019 09:33:26 +0300")
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
Eli Zaretskii <eliz@gnu.org> writes:
>> From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
>> Date: Sun, 21 Apr 2019 21:55:38 -0400
>> Cc: david@tethera.net, notmuch@notmuchmail.org, 35370@debbugs.gnu.org
>>
>> Do you have any recommendation for how an external emacs module (which
>> aims to work with at emacs 25 as well at least) should handle this?
>
> Just remove any uses of it. Why are you using it now?
Should we remove the remaining uses of it from Emacs too?
[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 3300 bytes --]
From a3dca9511e1639ccfdf06bced16af5babb5078de Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@gmail.com>
Date: Tue, 7 May 2019 08:18:49 -0400
Subject: [PATCH] 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.
---
lisp/gnus/message.el | 13 ++++---------
lisp/gnus/mml.el | 4 +---
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index c8b6f0ee68..2c2122d89a 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4588,8 +4588,7 @@ (defun message-send-mail (&optional _)
(message-generate-headers '(Lines)))
;; Remove some headers.
(message-remove-header message-ignored-mail-headers t)
- (let ((mail-parse-charset message-default-charset))
- (mail-encode-encoded-word-buffer)))
+ (mail-encode-encoded-word-buffer))
(goto-char (point-max))
;; require one newline at the end.
(or (= (preceding-char) ?\n)
@@ -4962,8 +4961,7 @@ (defun message-send-news (&optional arg)
(message-generate-headers '(Lines)))
;; Remove some headers.
(message-remove-header message-ignored-news-headers t)
- (let ((mail-parse-charset message-default-charset))
- (mail-encode-encoded-word-buffer)))
+ (mail-encode-encoded-word-buffer))
(goto-char (point-max))
;; require one newline at the end.
(or (= (preceding-char) ?\n)
@@ -5441,8 +5439,7 @@ (defun message-do-fcc ()
(while (setq file (message-fetch-field "fcc" t))
(push file list)
(message-remove-header "fcc" nil t))
- (let ((mail-parse-charset message-default-charset)
- (rfc2047-header-encoding-alist
+ (let ((rfc2047-header-encoding-alist
(cons '("Newsgroups" . default)
rfc2047-header-encoding-alist)))
(mail-encode-encoded-word-buffer)))
@@ -8101,9 +8098,7 @@ (defun message-clone-locals (buffer &optional varstr)
(defun message-encode-message-body ()
(unless message-inhibit-body-encoding
- (let ((mail-parse-charset (or mail-parse-charset
- message-default-charset))
- (case-fold-search t)
+ (let ((case-fold-search t)
lines content-type-p)
(message-goto-body)
(save-restriction
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index f6d358dfc0..7a99a0dc46 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -48,7 +48,6 @@ (autoload 'message-mail-p "message")
(defvar gnus-article-mime-handles)
(defvar gnus-newsrc-hashtb)
-(defvar message-default-charset)
(defvar message-deletable-headers)
(defvar message-options)
(defvar message-posting-charset)
@@ -1015,8 +1014,7 @@ (defun mml-to-mime ()
;; Skip past any From_ headers.
(while (looking-at "From ")
(forward-line 1))
- (let ((mail-parse-charset message-default-charset))
- (mail-encode-encoded-word-buffer)))
+ (mail-encode-encoded-word-buffer))
(message-encode-message-body))
(defun mml-insert-mime (handle &optional no-markup)
--
2.11.0
next prev parent reply other threads:[~2019-05-07 12:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-20 20:00 notmuch-emacs: avoiding deprecated message-default-charset Daniel Kahn Gillmor
2019-04-21 14:41 ` David Bremner
2019-04-21 19:25 ` Daniel Kahn Gillmor
2019-04-21 22:05 ` bug#35370: " Noam Postavsky
2019-04-22 1:55 ` Daniel Kahn Gillmor
2019-04-22 6:33 ` Eli Zaretskii
2019-04-22 14:21 ` Daniel Kahn Gillmor
2019-04-22 15:37 ` Eli Zaretskii
2019-04-22 20:51 ` [PATCH] emacs: drop use of message-default-charset Daniel Kahn Gillmor
2019-04-22 21:23 ` Tomi Ollila
2019-05-07 9:38 ` David Bremner
2019-05-07 12:26 ` Noam Postavsky [this message]
2019-05-07 14:36 ` bug#35370: notmuch-emacs: avoiding deprecated message-default-charset Eli Zaretskii
2019-05-09 18:33 ` Lars Ingebrigtsen
2019-05-10 5:32 ` Eli Zaretskii
2019-05-10 10:45 ` Noam Postavsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d0kulab0.fsf@gmail.com \
--to=npostavs@gmail.com \
--cc=35370@debbugs.gnu.org \
--cc=david@tethera.net \
--cc=dkg@fifthhorseman.net \
--cc=eliz@gnu.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).