--- /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 9DD616DE009A\r
+ for <notmuch@notmuchmail.org>; Fri, 29 Jan 2016 09:27:10 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.356\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.356 tagged_above=-999 required=5 tests=[AWL=0.423, \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 F4u0oaFlaE61 for <notmuch@notmuchmail.org>;\r
+ Fri, 29 Jan 2016 09:27:09 -0800 (PST)\r
+Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com\r
+ [74.125.82.65]) by arlo.cworth.org (Postfix) with ESMTPS id A14826DE0AF8 for\r
+ <notmuch@notmuchmail.org>; Fri, 29 Jan 2016 09:27:08 -0800 (PST)\r
+Received: by mail-wm0-f65.google.com with SMTP id 128so8903908wmz.3\r
+ for <notmuch@notmuchmail.org>; Fri, 29 Jan 2016 09:27:08 -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=0X/jsVseyH/oTnptr3Ki0Za91lOU+HnuENP3Pi1dtjs=;\r
+ b=z8FEbvrBxXvJOA73bwx19H5PGvVmPcvkvJTkTthLKQYPUTIY+FanS9m25m0HvCLQdx\r
+ 9gGKgSoXLy1wP9nFUl8vWJXB61A2pC3aB5wNve+19CwoGO39SYKClnqiJJDPGF+PpouE\r
+ KAluBt1x6HshPJ8ya5NRl+BXFuDKySAHoQZSFzFDq6MzxGCsfUCjRvvctmods6z7+byt\r
+ VSxnqIbcwqFfWpXC9h/8tV8k750HwEk5fFvn9UK61qcOqI+DljM/OSmx1hAnG1K/beUx\r
+ oymh3R4mSUDzrfRjMIcRNB1awldXkkb/chCXWQeidy0LZkVhhWQpPHb7gAXXqq9zCUVU\r
+ Bxmg==\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=0X/jsVseyH/oTnptr3Ki0Za91lOU+HnuENP3Pi1dtjs=;\r
+ b=OxJZ0gKOqYVrbCmLS1ZYjCs01Xo278FGE3TGJ7OMT5YMOKEhMeX1m75nF38FqZRrnh\r
+ AWvu0PIJB1Qw7aDp/RDNTqaGNQ4cNBQDyAyD4cBzRzEBmXGgspsiurkxNrzn3DgUYqk3\r
+ 7Uk8dJCX2w9F+euWQ4BqpCwhVnvzvvwb1SenKD0QKB0g8PJPwNtskLSJdZiWEc5PvxeT\r
+ p/puKUMA6z4ZOsysVEe0AneFfDytxd2oZWz8RhayfTG6cHPL8euhPlTTIosRPTf4T93l\r
+ UPiUGdUxPS/HBfkCwS+ORdT0klpYzULF73KraC5mMVNRHIf4sbjHgzgQgaD/7cQ2Z4X/\r
+ 0S2g==\r
+X-Gm-Message-State:\r
+ AG10YOS/WYd08EXI645gtOlGGIRCNsGTA1Iz3ncH9Fz5fTeyxBJWXmOlGitwNDAFIaNRUg==\r
+X-Received: by 10.28.131.70 with SMTP id f67mr10682226wmd.66.1454088427238;\r
+ Fri, 29 Jan 2016 09:27:07 -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 e9sm16533897wja.25.2016.01.29.09.27.05\r
+ for <notmuch@notmuchmail.org>\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Fri, 29 Jan 2016 09:27:05 -0800 (PST)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 66f89116\r
+ for <notmuch@notmuchmail.org>; Fri, 29 Jan 2016 17:27:02 +0000 (UTC)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] emacs: Allow part preferences to depend on message\r
+ content.\r
+Date: Fri, 29 Jan 2016 17:27:01 +0000\r
+Message-Id: <1454088421-6081-2-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.6.3\r
+In-Reply-To: <1454088421-6081-1-git-send-email-dme@dme.org>\r
+References: <1454088421-6081-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, 29 Jan 2016 17:27:10 -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-mua.el | 2 +-\r
+ emacs/notmuch-show.el | 2 +-\r
+ 3 files changed, 18 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 89c01a5..6b815c2 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-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