From 6510812860cace66d0234699d67570eb94554c95 Mon Sep 17 00:00:00 2001 From: Adam Wolfe Gordon Date: Mon, 19 Mar 2012 10:32:40 +1800 Subject: [PATCH] [PATCH v8 08/11] emacs: Factor out useful functions into notmuch-lib --- aa/8957369148cc38ecd978f4c1ef143289cfb5fe | 169 ++++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 aa/8957369148cc38ecd978f4c1ef143289cfb5fe diff --git a/aa/8957369148cc38ecd978f4c1ef143289cfb5fe b/aa/8957369148cc38ecd978f4c1ef143289cfb5fe new file mode 100644 index 000000000..f4a79f5ce --- /dev/null +++ b/aa/8957369148cc38ecd978f4c1ef143289cfb5fe @@ -0,0 +1,169 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 2DB95431FAE + for ; Sun, 18 Mar 2012 09:33:08 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id uI2AExbAV3tE for ; + Sun, 18 Mar 2012 09:33:06 -0700 (PDT) +Received: from idcmail-mo1so.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10]) + by olra.theworths.org (Postfix) with ESMTP id ABD08431FD4 + for ; Sun, 18 Mar 2012 09:33:01 -0700 (PDT) +Received: from pd4ml3so-ssvc.prod.shaw.ca ([10.0.141.150]) + by pd4mo1so-svcs.prod.shaw.ca with ESMTP; 18 Mar 2012 10:33:00 -0600 +X-Cloudmark-SP-Filtered: true +X-Cloudmark-SP-Result: v=1.1 cv=b/gStvK98Bs6YfhBwCpxRApoLO2qoBYaarCtclPE+68= + c=1 sm=1 + a=dHRAfZDHJaYA:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17 + a=IRZdaMhHRr9h3ODv8asA:9 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 +Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56]) + by pd4ml3so-dmz.prod.shaw.ca with ESMTP; 18 Mar 2012 10:33:00 -0600 +Received: by lagos.xvx.ca (Postfix, from userid 1000) + id 74D7A8004839; Sun, 18 Mar 2012 10:33:00 -0600 (MDT) +From: Adam Wolfe Gordon +To: notmuch@notmuchmail.org +Subject: [PATCH v8 08/11] emacs: Factor out useful functions into notmuch-lib +Date: Sun, 18 Mar 2012 10:32:40 -0600 +Message-Id: <1332088363-22476-9-git-send-email-awg+notmuch@xvx.ca> +X-Mailer: git-send-email 1.7.5.4 +In-Reply-To: <1332088363-22476-1-git-send-email-awg+notmuch@xvx.ca> +References: <87fwd6kqtv.fsf@zancas.localnet> + <1332088363-22476-1-git-send-email-awg+notmuch@xvx.ca> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 18 Mar 2012 16:33:08 -0000 + +Move a few functions related to handling multipart/alternative parts +into notmuch-lib.el, so they can be used by future reply code. +--- + emacs/notmuch-lib.el | 33 +++++++++++++++++++++++++++++++++ + emacs/notmuch-show.el | 24 ++---------------------- + 2 files changed, 35 insertions(+), 22 deletions(-) + +diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el +index d315f76..7e3f110 100644 +--- a/emacs/notmuch-lib.el ++++ b/emacs/notmuch-lib.el +@@ -21,6 +21,8 @@ + + ;; This is an part of an emacs-based interface to the notmuch mail system. + ++(eval-when-compile (require 'cl)) ++ + (defvar notmuch-command "notmuch" + "Command to run the notmuch binary.") + +@@ -173,6 +175,37 @@ the user hasn't set this variable with the old or new value." + (list 'when (< emacs-major-version 23) + form)) + ++(defun notmuch-split-content-type (content-type) ++ "Split content/type into 'content' and 'type'" ++ (split-string content-type "/")) ++ ++(defun notmuch-match-content-type (t1 t2) ++ "Return t if t1 and t2 are matching content types, taking wildcards into account" ++ (let ((st1 (notmuch-split-content-type t1)) ++ (st2 (notmuch-split-content-type t2))) ++ (if (or (string= (cadr st1) "*") ++ (string= (cadr st2) "*")) ++ (string= (car st1) (car st2)) ++ (string= t1 t2)))) ++ ++(defvar notmuch-multipart/alternative-discouraged ++ '( ++ ;; Avoid HTML parts. ++ "text/html" ++ ;; multipart/related usually contain a text/html part and some associated graphics. ++ "multipart/related" ++ )) ++ ++(defun notmuch-multipart/alternative-choose (types) ++ "Return a list of preferred types from the given list of types" ++ ;; Based on `mm-preferred-alternative-precedence'. ++ (let ((seq types)) ++ (dolist (pref (reverse notmuch-multipart/alternative-discouraged)) ++ (dolist (elem (copy-sequence seq)) ++ (when (string-match pref elem) ++ (setq seq (nconc (delete elem seq) (list elem)))))) ++ seq)) ++ + ;; Compatibility functions for versions of emacs before emacs 23. + ;; + ;; Both functions here were copied from emacs 23 with the following copyright: +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 4a60631..ed938bf 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -542,30 +542,13 @@ current buffer, if possible." + (mm-display-part handle) + t)))))) + +-(defvar notmuch-show-multipart/alternative-discouraged +- '( +- ;; Avoid HTML parts. +- "text/html" +- ;; multipart/related usually contain a text/html part and some associated graphics. +- "multipart/related" +- )) +- + (defun notmuch-show-multipart/*-to-list (part) + (mapcar (lambda (inner-part) (plist-get inner-part :content-type)) + (plist-get part :content))) + +-(defun notmuch-show-multipart/alternative-choose (types) +- ;; Based on `mm-preferred-alternative-precedence'. +- (let ((seq types)) +- (dolist (pref (reverse notmuch-show-multipart/alternative-discouraged)) +- (dolist (elem (copy-sequence seq)) +- (when (string-match pref elem) +- (setq seq (nconc (delete elem seq) (list elem)))))) +- seq)) +- + (defun notmuch-show-insert-part-multipart/alternative (msg part content-type nth depth declared-type) + (notmuch-show-insert-part-header nth declared-type content-type nil) +- (let ((chosen-type (car (notmuch-show-multipart/alternative-choose (notmuch-show-multipart/*-to-list part)))) ++ (let ((chosen-type (car (notmuch-multipart/alternative-choose (notmuch-show-multipart/*-to-list part)))) + (inner-parts (plist-get part :content)) + (start (point))) + ;; This inserts all parts of the chosen type rather than just one, +@@ -808,9 +791,6 @@ current buffer, if possible." + + ;; Functions for determining how to handle MIME parts. + +-(defun notmuch-show-split-content-type (content-type) +- (split-string content-type "/")) +- + (defun notmuch-show-handlers-for (content-type) + "Return a list of content handlers for a part of type CONTENT-TYPE." + (let (result) +@@ -821,7 +801,7 @@ current buffer, if possible." + (list (intern (concat "notmuch-show-insert-part-*/*")) + (intern (concat + "notmuch-show-insert-part-" +- (car (notmuch-show-split-content-type content-type)) ++ (car (notmuch-split-content-type content-type)) + "/*")) + (intern (concat "notmuch-show-insert-part-" content-type)))) + result)) +-- +1.7.5.4 + -- 2.26.2