From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.bugs,gmane.mail.notmuch.general Subject: bug#35370: notmuch-emacs: avoiding deprecated message-default-charset Date: Tue, 07 May 2019 08:26:59 -0400 Message-ID: <87d0kulab0.fsf@gmail.com> 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> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="152137"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) Cc: david@tethera.net, notmuch@notmuchmail.org, Daniel Kahn Gillmor , 35370@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue May 07 14:28:12 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hNzCd-000dSm-PF for geb-bug-gnu-emacs@m.gmane.org; Tue, 07 May 2019 14:28:12 +0200 Original-Received: from localhost ([127.0.0.1]:46054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNzCc-0001tx-J1 for geb-bug-gnu-emacs@m.gmane.org; Tue, 07 May 2019 08:28:10 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:52367) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNzCV-0001tg-AG for bug-gnu-emacs@gnu.org; Tue, 07 May 2019 08:28:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNzCU-0006gc-1n for bug-gnu-emacs@gnu.org; Tue, 07 May 2019 08:28:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:44762) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hNzCT-0006gX-UQ for bug-gnu-emacs@gnu.org; Tue, 07 May 2019 08:28:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hNzCT-0001rS-KQ for bug-gnu-emacs@gnu.org; Tue, 07 May 2019 08:28:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Noam Postavsky Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 07 May 2019 12:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35370 X-GNU-PR-Package: emacs Original-Received: via spool by 35370-submit@debbugs.gnu.org id=B35370.15572320467113 (code B ref 35370); Tue, 07 May 2019 12:28:01 +0000 Original-Received: (at 35370) by debbugs.gnu.org; 7 May 2019 12:27:26 +0000 Original-Received: from localhost ([127.0.0.1]:58306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNzBt-0001qe-UN for submit@debbugs.gnu.org; Tue, 07 May 2019 08:27:26 -0400 Original-Received: from mail-it1-f178.google.com ([209.85.166.178]:40626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNzBs-0001qQ-43 for 35370@debbugs.gnu.org; Tue, 07 May 2019 08:27:24 -0400 Original-Received: by mail-it1-f178.google.com with SMTP id g71so10325671ita.5 for <35370@debbugs.gnu.org>; Tue, 07 May 2019 05:27:24 -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=kBEuAEU51/5U9MFvVJf7gRd++/gasex51UyoM5qm6fNpl1GZl+3m/1/4xwWgNJ3/WR MoWAdLgJs/IdkzSGqVj53BldXGJNADrB+i0MC/Xo0idbF7YkOazyZZR4r4hiihNV+l34 p1Q0G6Fhkg5LAUkJXkCjc1uBuzp3GheVTjE0Wasp4GcKZSGh2q1ftfbBWKHpeGBvPbO/ je13n0l8TPmawP5nG1EwDKEFZjKnniknGCK3dQl6AeOvrT2ylMCq7scjofsY6kdPQ46r sBZyaynx/7RH9Dh0/UjTm1+WHGQ04c9iitfY4smgk8JnNCLoil0c8dj7CUCLJevikxzn rfvg== X-Gm-Message-State: APjAAAUDKP5QzEhxqYn5Dsy7jc0Ps/5jvGrlR2DEgRGRT6q4xaxAJNZ/ YlSDOx3xdrPH0c0oh/0xylaniE4i 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) Original-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) In-Reply-To: <83k1fm8s7d.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 22 Apr 2019 09:33:26 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:158867 gmane.mail.notmuch.general:27968 Archived-At: --=-=-= 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 --=-=-=--