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 1548C431FD0 for ; Tue, 5 Jul 2011 02:38:16 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.799 X-Spam-Level: X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, 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 0Pk3ENz-VzMX for ; Tue, 5 Jul 2011 02:38:11 -0700 (PDT) Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 8483D431FB6 for ; Tue, 5 Jul 2011 02:38:11 -0700 (PDT) Received: by bwg12 with SMTP id 12so5375853bwg.26 for ; Tue, 05 Jul 2011 02:38:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:in-reply-to:references:user-agent:date:message-id :mime-version:content-type; bh=Zl58+NrUTIoS/GDpMXAbtYF5EUfuc8ybIQqzHO23jcI=; b=QRkIUJ5SpSAw6SXK309QijcoJp5bq/0Q2lJCvigI4Z0LaSa/U3BN9MXj/3zemxfqS1 Lc78K3/5VCqCmdHoeh++vEDtWz92oa3VEcJOmmfpp63S9b3uKbdfdnPZ7216mm7d96D+ FCWOBzE4OucUgXw0ZlTZ4aOCE75gR5kAEopmc= Received: by 10.204.138.136 with SMTP id a8mr6768471bku.106.1309858689895; Tue, 05 Jul 2011 02:38:09 -0700 (PDT) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id t9sm6368574bkn.8.2011.07.05.02.38.08 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jul 2011 02:38:08 -0700 (PDT) From: Dmitry Kurochkin To: 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-321-g41686e2 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Tue, 05 Jul 2011 13:38:03 +0400 Message-ID: <87iprh5apw.fsf@gmail.com> 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: Tue, 05 Jul 2011 09:38:16 -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]. Please do not apply this patch. I am considering a different solution: instead of making the trailing newline invisible, make the preceding newline invisible. This way a message would always have a visible newline at the end and it would prevent `beginning-of-visual-line' going beyond the beginning of message. FYI there is a discussion on emacs-devel [1] regarding point adjustment inside invisible regions. Regards, Dmitry [1] http://thread.gmane.org/gmane.emacs.devel/141479 > --- > 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 >