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 27F3E431FD0 for ; Mon, 4 Jul 2011 01:25:52 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 dw4Hcfb8Z8D3 for ; Mon, 4 Jul 2011 01:25:51 -0700 (PDT) Received: from mail-wy0-f181.google.com (mail-wy0-f181.google.com [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 403A7431FB6 for ; Mon, 4 Jul 2011 01:25:51 -0700 (PDT) Received: by wyh22 with SMTP id 22so3782485wyh.26 for ; Mon, 04 Jul 2011 01:25:50 -0700 (PDT) Received: by 10.227.28.206 with SMTP id n14mr5246859wbc.4.1309767949858; Mon, 04 Jul 2011 01:25:49 -0700 (PDT) Received: from localhost ([109.131.160.67]) by mx.google.com with ESMTPS id fp5sm3057841wbb.49.2011.07.04.01.25.47 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 04 Jul 2011 01:25:48 -0700 (PDT) From: Pieter Praet To: Dmitry Kurochkin , notmuch@notmuchmail.org Subject: Re: [PATCH 2/2] emacs: skip forward to visible text in notmuch-show-message-extent In-Reply-To: <1309667286-10357-2-git-send-email-dmitry.kurochkin@gmail.com> References: <1309667286-10357-1-git-send-email-dmitry.kurochkin@gmail.com> <1309667286-10357-2-git-send-email-dmitry.kurochkin@gmail.com> User-Agent: Notmuch/0.5-326-ga5de9f3 (http://notmuchmail.org) Emacs/23.1.50.1 (x86_64-pc-linux-gnu) Date: Mon, 04 Jul 2011 10:25:46 +0200 Message-ID: <87wrfy4flh.fsf@praet.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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: Mon, 04 Jul 2011 08:25:52 -0000 On Sun, 3 Jul 2011 08:28:06 +0400, Dmitry Kurochkin wrote: > The patch rewrites `notmuch-show-message-extent' to be more > robust. The main goal is to make it work as expected if point is > invisible. Besides, there are no more point movements and > property search functions are used instead manual loops. The > comment regarding properties strangeness is removed since there > is no strangeness here: property ranges (as well as overlay, and > many others, I believe) are given as [begin, end), not [begin, > end]. > --- > emacs/notmuch-show.el | 19 +++++++++++-------- > 1 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el > index f96743b..cf8b405 100644 > --- a/emacs/notmuch-show.el > +++ b/emacs/notmuch-show.el > @@ -933,15 +933,18 @@ All currently available key bindings: > > ;; Movement related functions. > > -;; There's some strangeness here where a text property applied to a > -;; region a->b is not found when point is at b. We walk backwards > -;; until finding the property. > (defun notmuch-show-message-extent () > - (let (r) > - (save-excursion > - (while (not (setq r (get-text-property (point) :notmuch-message-extent))) > - (backward-char))) > - r)) > + (let ((p (point))) > + ;; if point is invisible, skip forward to visible text > + (while (invisible-p p) > + (setq p (next-single-char-property-change p 'invisible))) > + ;; if no visible text found, use the point > + (or p (setq p (point))) > + (or (get-text-property p :notmuch-message-extent) > + ;; if there is no text property, skip to the previous message > + (and (setq p (previous-single-char-property-change > + p :notmuch-message-extent)) > + (get-text-property p :notmuch-message-extent))))) > > (defun notmuch-show-message-top () > (car (notmuch-show-message-extent))) > -- > 1.7.5.4 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch Signed-off-by: Pieter Praet Though it's worth noting that (as a previous test of yours [1] demonstrates), it doesn't work consistently when the previous message has a text/html part: complains with "No URL at point". Peace -- Pieter [1] id:"1309752441-10651-4-git-send-email-dmitry.kurochkin@gmail.com"