Re: [PATCH] emacs: Fix applying stickiness to the :notmuch-part property

diff --git a/f4/8c946c8975d2c6493bed10d43bad815d11e137 b/f4/8c946c8975d2c6493bed10d43bad815d11e137
new file mode 100644 (file)
index 0000000..cc6e0d9
--- /dev/null
+++ b/f4/8c946c8975d2c6493bed10d43bad815d11e137
@@ -0,0 +1,104 @@
+Return-Path: <tomi.ollila@iki.fi>\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 673FA431FAF\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Jun 2013 10:21:34 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 UJ8CROAyPpNK for <notmuch@notmuchmail.org>;\r
+       Mon,  3 Jun 2013 10:21:26 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 82130431FAE\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Jun 2013 10:21:26 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 399BF100030;\r
+       Mon,  3 Jun 2013 20:21:21 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] emacs: Fix applying stickiness to the :notmuch-part\r
+       property\r
+In-Reply-To: <1370272679-20175-1-git-send-email-amdragon@mit.edu>\r
+References: <1370272679-20175-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.15.2+168~gf91ff62 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Mon, 03 Jun 2013 20:21:20 +0300\r
+Message-ID: <m2vc5v3yb3.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Mon, 03 Jun 2013 17:21:34 -0000\r
+\r
+On Mon, Jun 03 2013, Austin Clements <amdragon@MIT.EDU> wrote:\r
+\r
+> Previously, we simply called pushnew to add :notmuch-part to the\r
+> front-sticky and rear-nonsticky text property lists.  This works if\r
+> these are nil or lists, but they can also have the value t, meaning\r
+> that all properties are front-sticky/rear-nonsticky.  In this case,\r
+> pushnew will signal an error because t is not a list.  We never set\r
+> these properties to t ourselves, but since we apply these property\r
+> changes over arbitrary renderer output, we have to deal with this\r
+> possibility.\r
+> ---\r
+\r
+LGTM (took a while to understand :D).\r
+\r
+Tomi\r
+\r
+\r
+>  emacs/notmuch-show.el |   13 ++++++++++---\r
+>  1 file changed, 10 insertions(+), 3 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+> index 5771950..83bb9ad 100644\r
+> --- a/emacs/notmuch-show.el\r
+> +++ b/emacs/notmuch-show.el\r
+> @@ -846,11 +846,18 @@ If HIDE is non-nil then initially hide this part."\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
+> +    ;; applied to the beginning of each line when we indent the\r
+> +    ;; message.  Since we're operating on arbitrary renderer output,\r
+> +    ;; watch out for sticky specs of t, which means all properties are\r
+> +    ;; front-sticky/rear-nonsticky.\r
+>      (notmuch-map-text-property beg (point) 'front-sticky\r
+> -                           (lambda (v) (pushnew :notmuch-part v)))\r
+> +                           (lambda (v) (if (listp v)\r
+> +                                           (pushnew :notmuch-part v)\r
+> +                                         v)))\r
+>      (notmuch-map-text-property beg (point) 'rear-nonsticky\r
+> -                           (lambda (v) (pushnew :notmuch-part v)))))\r
+> +                           (lambda (v) (if (listp v)\r
+> +                                           (pushnew :notmuch-part v)\r
+> +                                         v)))))\r
+>  \r
+>  (defun notmuch-show-insert-body (msg body depth)\r
+>    "Insert the body BODY at depth DEPTH in the current thread."\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r