--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 125A0431FB6\r
+ for <notmuch@notmuchmail.org>; Thu, 30 May 2013 07:33:41 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id PcSsA6FYWOFv for <notmuch@notmuchmail.org>;\r
+ Thu, 30 May 2013 07:33:32 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 938CE431FAE\r
+ for <notmuch@notmuchmail.org>; Thu, 30 May 2013 07:33:32 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Ui3ut-0002P3-1l; Thu, 30 May 2013 15:33:28 +0100\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1Ui3us-0000lS-7O; Thu, 30 May 2013 15:33:22 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2 0/5] emacs: Part command improvements\r
+In-Reply-To: <1369876428-13537-1-git-send-email-amdragon@mit.edu>\r
+References: <1369876428-13537-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.14+255~gff3cc55 (http://notmuchmail.org) Emacs/23.4.1\r
+ (i486-pc-linux-gnu)\r
+Date: Thu, 30 May 2013 15:33:21 +0100\r
+Message-ID: <87k3mgh70u.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 754b925b7f2ccd33a9a4934d587db674 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -0.1\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -0.1 points.\r
+ Summary of the scoring: \r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.1 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 30 May 2013 14:33:41 -0000\r
+\r
+\r
+This looks excellent. +1 from me.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+Austin Clements <amdragon@MIT.EDU> writes:\r
+\r
+> This is v2 of id:87zjvghx82.fsf@qmul.ac.uk. In addition to some\r
+> general improvements, this fixes the handling of part overlays in\r
+> indented messages, removes the special part button map entirely in\r
+> favor of the "." submap, and adds a NEWS patch.\r
+>\r
+> The diff from v1 follows\r
+>\r
+> diff --git a/NEWS b/NEWS\r
+> index a7f2ec6..23f4c6a 100644\r
+> --- a/NEWS\r
+> +++ b/NEWS\r
+> @@ -61,6 +61,22 @@ notmuch-vim, but of course that is their decision.\r
+> Emacs Interface\r
+> ---------------\r
+> \r
+> +New keymap to view/save parts\r
+> +\r
+> + To view or save a single MIME part of a message, use the new "."\r
+> + submap (e.g., ". s" to save, ". v" to view). Previously, these keys\r
+> + were only available when point was on a part button and they did not\r
+> + have the "." prefix, so they were difficult to invoke (impossible if\r
+> + a part did not have a button) and clashed with other bindings.\r
+> + These new bindings also appear in show's help, so you don't have to\r
+> + memorize them.\r
+> +\r
+> +Default part save directory is now `mm-default-directory`\r
+> +\r
+> + Previously, notmuch offered to save parts and attachments to a mix\r
+> + of `mm-default-directory`, `mailcap-download-directory`, and `~/`.\r
+> + This has been standardized on `mm-default-directory`.\r
+> +\r
+> No Emacs 22 support\r
+> \r
+> The Emacs 22 support added late 2010 was sufficient only for a short\r
+> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+> index 09ce25e..2186783 100644\r
+> --- a/emacs/notmuch-lib.el\r
+> +++ b/emacs/notmuch-lib.el\r
+> @@ -360,21 +360,17 @@ OBJECT."\r
+> below\r
+> string))\r
+> \r
+> -(defun notmuch-put-text-property-if-nil (start end property value\r
+> - &optional object)\r
+> - "Like `put-text-property', but only set the property where it is nil."\r
+> +(defun notmuch-map-text-property (start end prop func &optional object)\r
+> + "Transform text property PROP using FUNC.\r
+> +\r
+> +Applies FUNC to each distinct value of the text property PROP\r
+> +between START and END of OBJECT, setting PROP to the value\r
+> +returned by FUNC."\r
+> (while (< start end)\r
+> - (let ((start-nil (text-property-any start end property nil object)))\r
+> - (if (null start-nil)\r
+> - ;; There are no more nil regions; exit the loop\r
+> - (setq start end)\r
+> - ;; Find the end of the nil region\r
+> - (let ((end-nil\r
+> - (or (text-property-not-all start-nil end property nil object)\r
+> - end)))\r
+> - ;; Set the property\r
+> - (put-text-property start-nil end-nil property value object)\r
+> - (setq start end-nil))))))\r
+> + (let ((value (get-text-property start prop object))\r
+> + (next (next-single-property-change start prop object end)))\r
+> + (put-text-property start next prop (funcall func value) object)\r
+> + (setq start next))))\r
+> \r
+> (defun notmuch-logged-error (msg &optional extra)\r
+> "Log MSG and EXTRA to *Notmuch errors* and signal MSG.\r
+> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+> index 380b144..613e666 100644\r
+> --- a/emacs/notmuch-show.el\r
+> +++ b/emacs/notmuch-show.el\r
+> @@ -466,7 +466,6 @@ message at DEPTH in the current thread."\r
+> \r
+> (define-button-type 'notmuch-show-part-button-type\r
+> 'action 'notmuch-show-part-button-default\r
+> - 'keymap 'notmuch-show-part-button-map\r
+> 'follow-link t\r
+> 'face 'message-mml\r
+> :supertype 'notmuch-button-type)\r
+> @@ -843,8 +842,15 @@ If HIDE is non-nil then initially hide this part."\r
+> (insert "\n"))\r
+> (notmuch-show-create-part-overlays msg beg (point) hide)\r
+> ;; Record part information. Since we already inserted subparts,\r
+> - ;; don't override exiting :notmuch-part properties.\r
+> - (notmuch-put-text-property-if-nil beg (point) :notmuch-part part)))\r
+> + ;; don't override existing :notmuch-part properties.\r
+> + (notmuch-map-text-property beg (point) :notmuch-part\r
+> + (lambda (v) (or v part)))\r
+> + ;; Make :notmuch-part front sticky and rear non-sticky so it stays\r
+> + ;; applied to the beginning of each line when we indent the message.\r
+> + (notmuch-map-text-property beg (point) 'front-sticky\r
+> + (lambda (v) (pushnew :notmuch-part v)))\r
+> + (notmuch-map-text-property beg (point) 'rear-nonsticky\r
+> + (lambda (v) (pushnew :notmuch-part v)))))\r
+> \r
+> (defun notmuch-show-insert-body (msg body depth)\r
+> "Insert the body BODY at depth DEPTH in the current thread."\r
+> @@ -1194,11 +1200,6 @@ reset based on the original query."\r
+> "Submap for part commands")\r
+> (fset 'notmuch-show-part-map notmuch-show-part-map)\r
+> \r
+> -(defvar notmuch-show-part-button-map\r
+> - (make-composed-keymap notmuch-show-part-map button-map)\r
+> - "Keymap for part button commands")\r
+> -(fset 'notmuch-show-part-button-map notmuch-show-part-button-map)\r
+> -\r
+> (defvar notmuch-show-mode-map\r
+> (let ((map (make-sparse-keymap)))\r
+> (define-key map "?" 'notmuch-help)\r
+> @@ -1365,7 +1366,7 @@ Some useful entries are:\r
+> (get-text-property (point) :notmuch-message-properties)))\r
+> \r
+> (defun notmuch-show-get-part-properties ()\r
+> - "Return the properties of the part containing point.\r
+> + "Return the properties of the innermost part containing point.\r
+> \r
+> This is the part property list retrieved from the CLI. Signals\r
+> an error if there is no part containing point."\r
projects / notmuch-archives.git / commitdiff