1 Return-Path: <markwalters1009@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by arlo.cworth.org (Postfix) with ESMTP id 32E306DE091C
\r
6 for <notmuch@notmuchmail.org>; Fri, 10 Jun 2016 16:03:26 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.336 tagged_above=-999 required=5 tests=[AWL=0.234,
\r
12 DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7,
\r
14 RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001]
\r
16 Received: from arlo.cworth.org ([127.0.0.1])
\r
17 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
18 with ESMTP id c3BpuX6F3tyZ for <notmuch@notmuchmail.org>;
\r
19 Fri, 10 Jun 2016 16:03:18 -0700 (PDT)
\r
20 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com
\r
21 [74.125.82.65]) by arlo.cworth.org (Postfix) with ESMTPS id 0E8756DE02A6 for
\r
22 <notmuch@notmuchmail.org>; Fri, 10 Jun 2016 16:03:09 -0700 (PDT)
\r
23 Received: by mail-wm0-f65.google.com with SMTP id n184so1714048wmn.1
\r
24 for <notmuch@notmuchmail.org>; Fri, 10 Jun 2016 16:03:08 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=from:to:cc:subject:date:message-id:in-reply-to:references;
\r
27 bh=gIV8dyppNyBRHkA9oCDL0xDKLJiIaJGjgz13raDHHBc=;
\r
28 b=jp/A76npHBe6wFSWzub/14XDa5fj5c+7ZJd8bJ8Qnoy0kz/Y2j1ZPwn4FQmHxgCKNH
\r
29 1cn/p7VcDQPGt6LQvrD724yK7ySX4HheJ9gywnJVFxW2jIXXHp9zXLIwN/3cHUy8HcRe
\r
30 BCZhcSv6DnznJvnsLeRL9YjSyhsy4Mjpp1+FiCrVmc+i3VXxkY0zYpe9SKiQhTfMed6n
\r
31 TfKLHhW+PTYL1Dgt/2bOWnDpx3d/IfuPadRb2M+y1vpJ7nra7bq4XiY/AEP9eUtIQElc
\r
32 LuCcqs7VxYQ7E/v/B1oVz4+agT6DBZNI9FwKT7YP/dIEqKCwDGpjbDa+7T9xxY9kWfu0
\r
34 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
35 d=1e100.net; s=20130820;
\r
36 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
\r
38 bh=gIV8dyppNyBRHkA9oCDL0xDKLJiIaJGjgz13raDHHBc=;
\r
39 b=hrPBoLziuDt2zv3f189QQDZP/Ohol6xQcw5kNGcCIBR+dYDMwNKQZwQ6AnJzjCqI37
\r
40 yYWAEFaqwhdgo8q/8Oxr6FZkzJRokoIdCA3w/YzOQHUGJch5XdbY7nsNi4MhS+SR8HA5
\r
41 nCCvDzZxDAs2ZltRQjuF0xb2/nB+FZfSGqkzgE28j824YZmytZ1NkZPgY/gFZj5tBQ9W
\r
42 c1BQgGE0mM0nmwPUFbkwsxf/Z5okT868ZPIaOAnaAPR3r3Agdotby1DEw3buCUGWgFud
\r
43 h89I2nxhrvv+H5AlQb6583npVQjnmvgGWYWobxi8z3SMA9aE5JlNMed9d9k23TKwt/Lr
\r
46 ALyK8tJuQ7ilkx82S2M44UhF7NIwXldQMpq08oU0eYK+rM8SNX/Qe5tyCTKmjlY40ryS9Q==
\r
47 X-Received: by 10.28.228.86 with SMTP id b83mr981664wmh.11.1465599787650;
\r
48 Fri, 10 Jun 2016 16:03:07 -0700 (PDT)
\r
49 Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])
\r
50 by smtp.gmail.com with ESMTPSA id r129sm1255989wmr.20.2016.06.10.16.03.06
\r
51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
52 Fri, 10 Jun 2016 16:03:06 -0700 (PDT)
\r
53 From: Mark Walters <markwalters1009@gmail.com>
\r
54 To: notmuch@notmuchmail.org
\r
55 Subject: [PATCH 4/6] emacs: simplify our local copy of message-do-fcc
\r
56 Date: Sat, 11 Jun 2016 00:02:50 +0100
\r
57 Message-Id: <1465599772-10297-5-git-send-email-markwalters1009@gmail.com>
\r
58 X-Mailer: git-send-email 2.1.4
\r
59 In-Reply-To: <1465599772-10297-1-git-send-email-markwalters1009@gmail.com>
\r
60 References: <1465599772-10297-1-git-send-email-markwalters1009@gmail.com>
\r
61 X-BeenThere: notmuch@notmuchmail.org
\r
62 X-Mailman-Version: 2.1.20
\r
64 List-Id: "Use and development of the notmuch mail system."
\r
65 <notmuch.notmuchmail.org>
\r
66 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
67 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
68 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
69 List-Post: <mailto:notmuch@notmuchmail.org>
\r
70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
71 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
72 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
73 X-List-Received-Date: Fri, 10 Jun 2016 23:03:26 -0000
\r
75 message-do-fcc has lots of functionality we don't need, so remove it.
\r
77 emacs/notmuch-maildir-fcc.el | 24 +-----------------------
\r
78 emacs/notmuch-mua.el | 11 ++++-------
\r
79 2 files changed, 5 insertions(+), 30 deletions(-)
\r
81 diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
\r
82 index 6fed11f..7b3f232 100644
\r
83 --- a/emacs/notmuch-maildir-fcc.el
\r
84 +++ b/emacs/notmuch-maildir-fcc.el
\r
85 @@ -159,29 +159,7 @@ This is a direct copy from message-mode's message-do-fcc."
\r
86 ;; Process FCC operations.
\r
88 (setq file (pop list))
\r
89 - (if (string-match "^[ \t]*|[ \t]*\\(.*\\)[ \t]*$" file)
\r
90 - ;; Pipe the article to the program in question.
\r
91 - (call-process-region (point-min) (point-max) shell-file-name
\r
92 - nil nil nil shell-command-switch
\r
93 - (match-string 1 file))
\r
94 - ;; Save the article.
\r
95 - (setq file (expand-file-name file))
\r
96 - (unless (file-exists-p (file-name-directory file))
\r
97 - (make-directory (file-name-directory file) t))
\r
98 - (if (and message-fcc-handler-function
\r
99 - (not (eq message-fcc-handler-function 'rmail-output)))
\r
100 - (funcall message-fcc-handler-function file)
\r
101 - ;; FIXME this option, rmail-output (also used if
\r
102 - ;; message-fcc-handler-function is nil) is not
\r
103 - ;; documented anywhere AFAICS. It should work in Emacs
\r
104 - ;; 23; I suspect it does not work in Emacs 22.
\r
105 - ;; FIXME I don't see the need for the two different cases here.
\r
106 - ;; mail-use-rfc822 makes no difference (in Emacs 23),and
\r
107 - ;; the third argument just controls \"Wrote file\" message.
\r
108 - (if (and (file-readable-p file) (mail-file-babyl-p file))
\r
109 - (rmail-output file 1 nil t)
\r
110 - (let ((mail-use-rfc822 t))
\r
111 - (rmail-output file 1 t t))))))
\r
112 + (notmuch-fcc-handler file))
\r
113 (kill-buffer (current-buffer))))))
\r
115 (defun notmuch-fcc-handler (fcc-header)
\r
116 diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
\r
117 index 3c1c046..60ad6c3 100644
\r
118 --- a/emacs/notmuch-mua.el
\r
119 +++ b/emacs/notmuch-mua.el
\r
122 (declare-function notmuch-show-insert-body "notmuch-show" (msg body depth))
\r
123 (declare-function notmuch-fcc-header-setup "notmuch-maildir-fcc" ())
\r
124 -(declare-function notmuch-fcc-handler "notmuch-maildir-fcc" (destdir))
\r
125 (declare-function notmuch-maildir-message-do-fcc "notmuch-maildir-fcc" ())
\r
128 @@ -491,15 +490,13 @@ will be addressed to all recipients of the source message."
\r
130 (defun notmuch-mua-send-and-exit (&optional arg)
\r
132 - (let ((message-fcc-handler-function #'notmuch-fcc-handler))
\r
133 - (letf (((symbol-function 'message-do-fcc) #'notmuch-maildir-message-do-fcc))
\r
134 - (message-send-and-exit arg))))
\r
135 + (letf (((symbol-function 'message-do-fcc) #'notmuch-maildir-message-do-fcc))
\r
136 + (message-send-and-exit arg)))
\r
138 (defun notmuch-mua-send (&optional arg)
\r
140 - (let ((message-fcc-handler-function #'notmuch-fcc-handler))
\r
141 - (letf (((symbol-function 'message-do-fcc) #'notmuch-maildir-message-do-fcc))
\r
142 - (message-send arg))))
\r
143 + (letf (((symbol-function 'message-do-fcc) #'notmuch-maildir-message-do-fcc))
\r
144 + (message-send arg)))
\r
146 (defun notmuch-mua-kill-buffer ()
\r