[PATCH v3] emacs: Allow part preferences to depend on message content.

diff --git a/71/ece7e869a27e69dfdbe244b8d57b2f4f1f5539 b/71/ece7e869a27e69dfdbe244b8d57b2f4f1f5539
new file mode 100644 (file)
index 0000000..71069d0
--- /dev/null
+++ b/71/ece7e869a27e69dfdbe244b8d57b2f4f1f5539
@@ -0,0 +1,141 @@
+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 6C13C6DE0314\r
+ for <notmuch@notmuchmail.org>; Sun,  3 Apr 2016 09:04:53 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.166\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.166 tagged_above=-999 required=5\r
+ tests=[AWL=-0.099, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,\r
+ RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652, UNPARSEABLE_RELAY=0.001]\r
+ 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 tItUJHHdabPg for <notmuch@notmuchmail.org>;\r
+ Sun,  3 Apr 2016 09:04:45 -0700 (PDT)\r
+Received: from mail-lb0-f195.google.com (mail-lb0-f195.google.com\r
+ [209.85.217.195])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 35A576DE01C2\r
+ for <notmuch@notmuchmail.org>; Sun,  3 Apr 2016 09:04:45 -0700 (PDT)\r
+Received: by mail-lb0-f195.google.com with SMTP id bc4so17481049lbc.0\r
+ for <notmuch@notmuchmail.org>; Sun, 03 Apr 2016 09:04:45 -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:in-reply-to:references;\r
+ bh=efVU9wQRFFod+ey1vTMyZ9KpeBOt+bqbxJAV+a9l+dk=;\r
+ b=eFQRy4Ryyb+Kaf15mSIWajUzA92rmuXqXQSIa5AgdZxGuwIutn+rFo6ofVVxt9YmzO\r
+ C/l9444ab4PhUgoodnhZZ0zJSbjdGXdeWDW0YmJ6php1YqEbLB7KhQ2Zm47KfRpm4F8o\r
+ 1Dg8vdU5Qa+3II48yH/BUvM7fiqPwhuYgGs5cFXucuXRLLYFJ4XurS5AqpmDGfdL32x4\r
+ LVsG1U0QKI92JZsryBh7EbM5zxx8DzEHgwsAl8SMXVvldChQK5hzHaNugL6iDgdj5gxt\r
+ ZB+S9pl6XtVMqfedqEUS7ai7PS9ExM0BdSljz852rc319cltHdw9DcGZA0ks3hbZGa0h\r
+ GgEw==\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:in-reply-to\r
+ :references;\r
+ bh=efVU9wQRFFod+ey1vTMyZ9KpeBOt+bqbxJAV+a9l+dk=;\r
+ b=lUQNV624W6ERZEWNahOJ5k1Nv+BFJDpgWvm1W4KPXx4hOcXp97mA7iPKDx+gow1bnm\r
+ EBZOl15tHEZ1ZyQ9PUmZpBwWTEjLA+41cQxPBEfhJIn5+52Y9b2K1aPm40QunrTGlVg0\r
+ Kykockbx5n6oXAToC/M6it+LBC6h39oPSWki4fk2pn9hTR60QbY7OwrbCpzBpgJRAlHg\r
+ CKgDMKqcDNGRE3ggmGjhKVPAkMV9gX5wT6nyzAsmt/30OeTEWDY/OISNeq7teIsUE/Xm\r
+ hTTZ9/qKtRUOXQN+1G3kyMDMzm8QPFyrULDYZYzbYGHLiBV/k2wfWxCmG5LCj3OlmOR0\r
+ VAWQ==\r
+X-Gm-Message-State:\r
+ AD7BkJI0g2FHLqwMnz9fYlClCXqtXEMFWyRk19YdWopPG183YVyPrQrlAJy72RgOrLEHJg==\r
+X-Received: by 10.28.126.65 with SMTP id z62mr7945087wmc.42.1459699483568;\r
+ Sun, 03 Apr 2016 09:04:43 -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 gk4sm24351438wjd.7.2016.04.03.09.04.42\r
+ for <notmuch@notmuchmail.org>\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sun, 03 Apr 2016 09:04:42 -0700 (PDT)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id d5c60808\r
+ for <notmuch@notmuchmail.org>; Sun, 3 Apr 2016 16:04:38 +0000 (UTC)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3] emacs: Allow part preferences to depend on message\r
+ content.\r
+Date: Sun,  3 Apr 2016 17:04:38 +0100\r
+Message-Id: <1459699478-21167-2-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1459699478-21167-1-git-send-email-dme@dme.org>\r
+References: <1459699478-21167-1-git-send-email-dme@dme.org>\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 16:04:53 -0000\r
+\r
+Currently the preference for which sub-part of a multipart/alternative\r
+part is shown is global. Allow to the user to override the settings on a\r
+per-message basis by providing the ability to call a function that has\r
+access to the message to return the discouraged type list.\r
+\r
+The original approach is retained as the default.\r
+---\r
+ emacs/notmuch-lib.el  | 20 ++++++++++++++++----\r
+ emacs/notmuch-show.el |  2 +-\r
+ 2 files changed, 17 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 75a3706..eca837d 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -520,11 +520,23 @@ This replaces spaces, percents, and double quotes in STR with\r
+     "multipart/related"\r
+     ))\r
+ \r
+-(defun notmuch-multipart/alternative-choose (types)\r
+-  "Return a list of preferred types from the given list of types"\r
++(defun notmuch-multipart/alternative-determine-discouraged (msg)\r
++  "Return the discouraged alternatives for the specified message."\r
++  ;; If a function, return the result of calling it.\r
++  (if (functionp notmuch-multipart/alternative-discouraged)\r
++      (funcall notmuch-multipart/alternative-discouraged msg)\r
++    ;; Otherwise simply return the value of the variable, which is\r
++    ;; assumed to be a list of discouraged alternatives. This is the\r
++    ;; default behaviour.\r
++    notmuch-multipart/alternative-discouraged))\r
++\r
++(defun notmuch-multipart/alternative-choose (msg types)\r
++  "Return a list of preferred types from the given list of types\r
++for this message, if present."\r
+   ;; Based on `mm-preferred-alternative-precedence'.\r
+-  (let ((seq types))\r
+-    (dolist (pref (reverse notmuch-multipart/alternative-discouraged))\r
++  (let ((discouraged (notmuch-multipart/alternative-determine-discouraged msg))\r
++      (seq types))\r
++    (dolist (pref (reverse discouraged))\r
+       (dolist (elem (copy-sequence seq))\r
+       (when (string-match pref elem)\r
+         (setq seq (nconc (delete elem seq) (list elem))))))\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 7c34449..f6a21e4 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -607,7 +607,7 @@ will return nil if the CID is unknown or cannot be retrieved."\r
+         (plist-get part :content)))\r
+ \r
+ (defun notmuch-show-insert-part-multipart/alternative (msg part content-type nth depth button)\r
+-  (let ((chosen-type (car (notmuch-multipart/alternative-choose (notmuch-show-multipart/*-to-list part))))\r
++  (let ((chosen-type (car (notmuch-multipart/alternative-choose msg (notmuch-show-multipart/*-to-list part))))\r
+       (inner-parts (plist-get part :content))\r
+       (start (point)))\r
+     ;; This inserts all parts of the chosen type rather than just one,\r
+-- \r
+2.1.4\r
+\r