From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 5A46C6DE1492 for ; Tue, 7 May 2019 05:27:21 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.395 X-Spam-Level: X-Spam-Status: No, score=-0.395 tagged_above=-999 required=5 tests=[AWL=-0.195, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id APOlcbXRXxN2 for ; Tue, 7 May 2019 05:27:20 -0700 (PDT) Received: from mail-it1-f176.google.com (mail-it1-f176.google.com [209.85.166.176]) by arlo.cworth.org (Postfix) with ESMTPS id 15A4A6DE1483 for ; Tue, 7 May 2019 05:27:20 -0700 (PDT) Received: by mail-it1-f176.google.com with SMTP id q14so26078330itk.0 for ; Tue, 07 May 2019 05:27:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=hR7NK55JZ96YmhjgPDCzv5jo13FeDf1Bk1Q1da2sCJY=; b=Ttcv+UmRO9JWEcpu4sEVDYoq4RaJDkDBKUxBG/TJiF59BkwfIaNEddBC/rDngGVfhZ FUMlIUXGue+uNOuRR56Xsj01OeEACgR92q1KPDlqiusx8wk22ledVRTQ5M5Q6aCnJAMk FUn99TJ+UojFdThMr62MplYmuCg1HMEtG/fF1iwugAutuKaDU8j51NSVLhf9t3VXyCPz go3DYZvzUR9Gokxq0V17xJtJG/zV5N6XUsY/cDJ6A55Y8EO6lOeefgqx0ZSC+MABcBzQ hLUDg+2xX4B/fgC9WiOUrDUMW4lqDAXcxF56+sBk55qQdfpoYwNOLMbwwSn4n1l+i2lk lCKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=hR7NK55JZ96YmhjgPDCzv5jo13FeDf1Bk1Q1da2sCJY=; b=SJqdm65Ee0JaucyvjmZqzjbMkh2iTryoZap6q/abMV43a9UtLCqNSDDNdgTr1X0ugv CJVA59X7+y6D1ss5SfbYruGj8CI4jU52psWxPzmYPM9p3zX359+jd6k0Wu4SSC106t5U CtQudXxsUpPXGlsIHPzVbxeEimAnHWUFzWbrDWeN0+UmVvvE3iqnjxzeHdo6VuVrEdmf 5K1xW1YRb56gYPazyhMEKscIRpxxallhKU2JdqLGSwBqLy9Afv+wf4Du+TdVQAOJl/Ux swoagjyaSxUfhMh+aPBcTP+2w1GPzI382LdTdFaHRmNd17OekE0TjDpvJHCnPdmiBW/W /IYg== X-Gm-Message-State: APjAAAWjUvbd6tWzE4yBEA/oQAXE0buBaqRCn/x7XKeDjpb0h9BIi1/k aXc61VRxzql3Bmfwk81ccz8= X-Google-Smtp-Source: APXvYqy7N8Iw+zT+H4Yu3TA2bHR3ydTX41MxVVIFswwKl3PnhM/xfP7A8FxlhoN5WjPsIGWM7Por3g== X-Received: by 2002:a24:2758:: with SMTP id g85mr9160093ita.30.1557232037999; Tue, 07 May 2019 05:27:17 -0700 (PDT) Received: from minid (cbl-45-2-119-34.yyz.frontiernetworks.ca. [45.2.119.34]) by smtp.gmail.com with ESMTPSA id c11sm418598itj.31.2019.05.07.05.27.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 May 2019 05:27:16 -0700 (PDT) From: Noam Postavsky To: Eli Zaretskii Cc: Daniel Kahn Gillmor , david@tethera.net, notmuch@notmuchmail.org, 35370@debbugs.gnu.org Subject: Re: bug#35370: notmuch-emacs: avoiding deprecated message-default-charset References: <87tveswipo.fsf@fifthhorseman.net> <874l6re7zh.fsf@tethera.net> <87a7gjw479.fsf@fifthhorseman.net> <87sgubrp40.fsf@gmail.com> <874l6qx0px.fsf@fifthhorseman.net> <83k1fm8s7d.fsf@gnu.org> Date: Tue, 07 May 2019 08:26:59 -0400 In-Reply-To: <83k1fm8s7d.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 22 Apr 2019 09:33:26 +0300") Message-ID: <87d0kulab0.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Mailman-Approved-At: Wed, 08 May 2019 08:47:27 -0700 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 May 2019 12:27:21 -0000 --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> From: Daniel Kahn Gillmor >> 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? --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=0001-Stop-using-message-default-charset-Bug-35370.patch Content-Description: patch >From a3dca9511e1639ccfdf06bced16af5babb5078de Mon Sep 17 00:00:00 2001 From: Noam Postavsky 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 --=-=-=--