From f079e7b9c34280fd2aaf531c99e0a3ca43c46b6b Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 22 Apr 2019 16:51:16 -0400 Subject: [PATCH] emacs: drop use of message-default-charset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apparently, message-default-charset is deprecated, which causes the following warning messages during the build: In notmuch-maildir-setup-message-for-saving: emacs/notmuch-maildir-fcc.el:172:31:Warning: ‘message-default-charset’ is an obsolete variable (as of 26.1); The default charset comes from the language environment In discussion with emacs upstream over on https://debbugs.gnu.org/35370, it appears that we can just drop this entirely and things should still work with emacs 25. --- emacs/notmuch-maildir-fcc.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el index 1551e8b6..ae56bacd 100644 --- a/emacs/notmuch-maildir-fcc.el +++ b/emacs/notmuch-maildir-fcc.el @@ -169,8 +169,7 @@ This is taken from the function message-do-fcc." (message-encode-message-body) (save-restriction (message-narrow-to-headers) - (let ((mail-parse-charset message-default-charset)) - (mail-encode-encoded-word-buffer))) + (mail-encode-encoded-word-buffer)) (goto-char (point-min)) (when (re-search-forward (concat "^" (regexp-quote mail-header-separator) "$")