--- /dev/null
+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 1CA616DE00DD\r
+ for <notmuch@notmuchmail.org>; Fri, 15 Jan 2016 05:35:06 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.471\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.471 tagged_above=-999 required=5 tests=[AWL=0.538, \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 02VRpVpTmo2n for <notmuch@notmuchmail.org>;\r
+ Fri, 15 Jan 2016 05:35:04 -0800 (PST)\r
+Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com\r
+ [74.125.82.66]) by arlo.cworth.org (Postfix) with ESMTPS id 0BDFA6DE1607 for\r
+ <notmuch@notmuchmail.org>; Fri, 15 Jan 2016 05:35:04 -0800 (PST)\r
+Received: by mail-wm0-f66.google.com with SMTP id u188so2889276wmu.0\r
+ for <notmuch@notmuchmail.org>; Fri, 15 Jan 2016 05:35:03 -0800 (PST)\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=rg9a1wZyTmC3l9iFL/5Mls/NcpgAG88Xg0d0XF9v3eY=;\r
+ b=JP3TCF9y5tsMw/yFhOWkiynbUA2xaQwtNSoGw8T8u1HB1NnuCBwpKLaceVTfpjpDl3\r
+ kxrnmH1F+dbbGkV4HaKCZeeynJOjKdgeyBZgMEQTuIbU4teU/thUNseJr3FgxpNtq5kc\r
+ mydkz0jljEwzFVG8aS/lkNpvAr0kH8RNVH4hGxUwl4MJRhsqGZ/8/EC6yBR0KzJVtLbz\r
+ 8J0CarGB81w4aKY+KE/v9D0iA1LrtH9JGsckRX+l3lq6ie60SVTcWbw2JbqECDwnLZCp\r
+ 6mYf6KhaZIahQ3KNg6MdwmmY90wlCd7LDRetLTuQbMvJNpcK3kVIg2pcbqnZhF6vx0/h\r
+ /weA==\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=rg9a1wZyTmC3l9iFL/5Mls/NcpgAG88Xg0d0XF9v3eY=;\r
+ b=YWgHxAfN6AF6W1pEpSWNTPFoyg6KOUybtBP9mXym4DVFKjCt4NrlvbfkER1cffR3b4\r
+ US4D7Vibp+vHlEH0JBJXxDJgNlNsIPv6EyhAfLl4XL11Bi3eXf41KOtK/Yfc/T9cQdex\r
+ FVoJokc2V+4fCjBH79+h6OkaMhYGMnYJ7cf9JHq5l7d5qvJmr/Vd/cd0eV8TftXgD39u\r
+ N4Ucpuam9Hes4IeM9S8DX7zjc/89CiEzUm/NRDxgZ+T5z5JWpBXPUl7QjMRjP3v0C7ah\r
+ /sfvu6RNy8VFELCDSMSW0F9DE1kd9ugEds1v1HZ+jct4WVuqKB5Za2PWr9HxyZhp9lbN\r
+ 8FKA==\r
+X-Gm-Message-State: ALoCoQmENMQUULb36dXpULT5t47eMSfoF5D7zpJ4NGr66raIdVC0JBGkX2u6+8JuDitPWQ/1xQ+brVtg69VwNwm9CLEEGYiUAQ==\r
+X-Received: by 10.194.114.106 with SMTP id\r
+ jf10mr12021610wjb.149.1452864902738; Fri, 15 Jan 2016 05:35:02 -0800 (PST)\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 id1sm10648439wjb.19.2016.01.15.05.35.01\r
+ for <notmuch@notmuchmail.org>\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Fri, 15 Jan 2016 05:35:01 -0800 (PST)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id f596f93b\r
+ for <notmuch@notmuchmail.org>; Fri, 15 Jan 2016 13:34:58 +0000 (UTC)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v1] emacs: Allow part preferences to depend on message\r
+ content.\r
+Date: Fri, 15 Jan 2016 13:34:58 +0000\r
+Message-Id: <1452864898-9719-2-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.6.3\r
+In-Reply-To: <1452864898-9719-1-git-send-email-dme@dme.org>\r
+References: <1452864898-9719-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: Fri, 15 Jan 2016 13:35:06 -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 two new options:\r
+\r
+ - the ability to call a function that has access to the message to\r
+ return the discouraged type list,\r
+ - a simple evaluation environment to reduce the need for most users to\r
+ write their own function.\r
+\r
+The original approach is retained as the default.\r
+---\r
+ emacs/notmuch-lib.el | 39 +++++++++++++++++++++++++++++++++++----\r
+ emacs/notmuch-mua.el | 2 +-\r
+ emacs/notmuch-show.el | 2 +-\r
+ 3 files changed, 37 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 89c01a5..2b9d108 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -520,11 +520,42 @@ 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-1 (msg directive)\r
++ (let* ((headers (plist-get msg :headers))\r
++ ;; Headers that we make available:\r
++ (from (plist-get headers :From))\r
++ (subject (plist-get headers :Subject))\r
++ (to (plist-get headers :To))\r
++ (cc (plist-get headers :Cc)))\r
++\r
++ (eval directive)))\r
++\r
++(defun notmuch-multipart/alternative-determine-discouraged (msg)\r
++ "Return the discouraged alternatives for the specified message."\r
++ (cond\r
++ ;; If a function, return the result of calling it.\r
++ ((functionp notmuch-multipart/alternative-discouraged)\r
++ (funcall notmuch-multipart/alternative-discouraged msg))\r
++\r
++ ;; If the first element is a string, return the list. This matches\r
++ ;; with the default setting of\r
++ ;; `notmuch-multipart/alternative-discouraged'.\r
++ ((and (listp notmuch-multipart/alternative-discouraged)\r
++ (stringp (car notmuch-multipart/alternative-discouraged)))\r
++ notmuch-multipart/alternative-discouraged)\r
++\r
++ ;; New style pattern matcher.\r
++ (t\r
++ (notmuch-multipart/alternative-determine-discouraged-1\r
++ msg 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-mua.el b/emacs/notmuch-mua.el\r
+index 5462f54..8244258 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -147,7 +147,7 @@ Note that these functions use `mail-citation-hook' if that is non-nil."\r
+ if (notmuch-match-content-type (plist-get part :content-type) "multipart/alternative")\r
+ collect (let* ((subparts (plist-get part :content))\r
+ (types (mapcar (lambda (part) (plist-get part :content-type)) subparts))\r
+- (chosen-type (car (notmuch-multipart/alternative-choose types))))\r
++ (chosen-type (car (notmuch-multipart/alternative-choose nil types))))\r
+ (loop for part in (reverse subparts)\r
+ if (notmuch-match-content-type (plist-get part :content-type) chosen-type)\r
+ return part))\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 3345878..2ec30a8 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -612,7 +612,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.6.3\r
+\r
projects / notmuch-archives.git / commitdiff