[PATCH v1] emacs: Decrypt non-text/plain parts during reply generation.

diff --git a/5f/0ec2f0f4f2be98d80b663d9f2bab200c9556ad b/5f/0ec2f0f4f2be98d80b663d9f2bab200c9556ad
new file mode 100644 (file)
index 0000000..8c123de
--- /dev/null
+++ b/5f/0ec2f0f4f2be98d80b663d9f2bab200c9556ad
@@ -0,0 +1,105 @@
+Return-Path: <dme@dme.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 316136DE01C2\r
+ for <notmuch@notmuchmail.org>; Sun,  3 Apr 2016 11:40:36 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.17\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.17 tagged_above=-999 required=5 tests=[AWL=-0.103,\r
+  DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652,\r
+ UNPARSEABLE_RELAY=0.001] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 0NJw8T4s2p9z for <notmuch@notmuchmail.org>;\r
+ Sun,  3 Apr 2016 11:40:28 -0700 (PDT)\r
+Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com\r
+ [209.85.215.65])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id A4FF06DE0159\r
+ for <notmuch@notmuchmail.org>; Sun,  3 Apr 2016 11:40:27 -0700 (PDT)\r
+Received: by mail-lf0-f65.google.com with SMTP id c62so19536106lfc.2\r
+ for <notmuch@notmuchmail.org>; Sun, 03 Apr 2016 11:40:27 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=dme-org.20150623.gappssmtp.com; s=20150623;\r
+ h=from:to:subject:date:message-id;\r
+ bh=DXjpIUP75UvJO6u1ldprwaW+6tY8wlODFcRLSIt1EFk=;\r
+ b=cydRT5PYtQA6gTJQjJiyyUpQ5K5xz1x7/7yEzpT1Qt2eGhi7WJVvZkOMKiqQf6OYB1\r
+ yqq0yicwXO3ZSIa2gEASTx8NSlupkihZQu8r/ekd/Q8WQukjLkrPfgeqgPU0yW6geD+3\r
+ 9hxXKA/1hQvy/ktf2QtFRXfEQC7zmuty4tVuctMF8xfoX5wf93tM38kKhJKpaY/lC35J\r
+ t0RuNl39Qd/sd5xiNxkjVGfZX3pIsiwtrwJrrazHy5b3d0SdOhjT0AkXDIJTs6O9Bwto\r
+ XISgce0Iqv9BoTngOLStqSKL/BrSSFxGMq1k0raa5GsGzDKh5ck5vBfaRaYH9/Lp81KS\r
+ d2eg==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:subject:date:message-id;\r
+ bh=DXjpIUP75UvJO6u1ldprwaW+6tY8wlODFcRLSIt1EFk=;\r
+ b=k9WKQowyX2qmF8lRLlQrUOPFR5AG1+eI5IFCP4AHWefkiltKfd6o4r7dt6PTsoohjO\r
+ V+ZYbEBVU43n0b2kK1eTYymQPQtaNJHi1gkGVD4Uw+h1hEOSf/de/+y+2jE7p0Oj5O8J\r
+ yRfLSJDQwkexB1T4vO4kU33LQ17NACXw1q0x6aizcccRxXya1knInbKFzyAOGh7E3CYA\r
+ lueoIqcMTwUtw7V6pbT9rGa3+Y0VzJ7K6IT4q8VleIgi6ZUdCT1JIqMc3yKeP9o8clZh\r
+ qMEZLgm/M8if7IoT7mgXsU4SW+rv6eYg6E8khvEPgwA/l9JZuvJcrsTSwCPyUJoae4RN\r
+ GMPQ==\r
+X-Gm-Message-State:\r
+ AD7BkJI7ms2t8kJqrIFZWA0gaeK/i+0WijuDQBqJKRE+oIuLclwqP/cMzgtp1kRQUZfB2w==\r
+X-Received: by 10.194.157.65 with SMTP id wk1mr496816wjb.83.1459708825488;\r
+ Sun, 03 Apr 2016 11:40:25 -0700 (PDT)\r
+Received: from disaster-area.hh.sledj.net\r
+ ([2a01:348:1a2:1:ea39:35ff:fe2c:a227])\r
+ by smtp.gmail.com with ESMTPSA id kj9sm25104388wjb.14.2016.04.03.11.40.24\r
+ for <notmuch@notmuchmail.org>\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sun, 03 Apr 2016 11:40:24 -0700 (PDT)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 119113cd\r
+ for <notmuch@notmuchmail.org>; Sun, 3 Apr 2016 18:40:23 +0000 (UTC)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v1] emacs: Decrypt non-text/plain parts during reply\r
+ generation.\r
+Date: Sun,  3 Apr 2016 19:40:23 +0100\r
+Message-Id: <1459708823-1852-1-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.1.4\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 03 Apr 2016 18:40:36 -0000\r
+\r
+If a user replies to a message which contains encrypted parts other than\r
+text/plain, ensure that the parts are decrypted when generating the\r
+cited text of the reply.\r
+---\r
+ emacs/notmuch-mua.el | 6 +++++-\r
+ 1 file changed, 5 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index cfdac0e..9bd3c82 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -248,7 +248,11 @@ mutiple parts get a header."\r
+                      ;; Don't omit long parts.\r
+                      (notmuch-show-max-text-part-size 0)\r
+                      ;; Insert headers for parts as appropriate for replying.\r
+-                     (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function))\r
++                     (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function)\r
++                     ;; Ensure that any encrypted parts are\r
++                     ;; decrypted during the generation of the reply\r
++                     ;; text.\r
++                     (notmuch-show-process-crypto process-crypto))\r
+                   (notmuch-show-insert-body original (plist-get original :body) 0)\r
+                   (buffer-substring-no-properties (point-min) (point-max)))))\r
+ \r
+-- \r
+2.1.4\r
+\r