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 5C598431FD0 for ; Mon, 4 Jul 2011 02:08:53 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 1.7 X-Spam-Level: * X-Spam-Status: No, score=1.7 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, FREEMAIL_REPLY=2.499, 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 3zHYdtFETtNB for ; Mon, 4 Jul 2011 02:08:52 -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 207A0431FB6 for ; Mon, 4 Jul 2011 02:08:51 -0700 (PDT) Received: by bwg12 with SMTP id 12so4604172bwg.26 for ; Mon, 04 Jul 2011 02:08:50 -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=rfe4SVPNHL4Px8u6zzVVTjULj1IHHe+cGwHTsThcR/E=; b=GNjSjvI9hhT+xfGmf4G4eKgVzUN5e1WckAgd0Xq10/HwzZyfisNZdXoDQGI79J+92V BKvYdVzMc9kKU8xrIRRmVWSZp3hA+vnu0k5MWQC2L/wrRCuc4wsSyVdZjeBAcp1eKXT4 c4lSx9ENb4OCu9YjtsHvmi0bcOv1YndOAhb7A= Received: by 10.204.42.18 with SMTP id q18mr2963bke.46.1309770530680; Mon, 04 Jul 2011 02:08:50 -0700 (PDT) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id k16sm5372009bks.13.2011.07.04.02.08.48 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 04 Jul 2011 02:08:49 -0700 (PDT) From: Dmitry Kurochkin To: Pieter Praet , notmuch@notmuchmail.org Subject: Re: [PATCH v2] emacs: add insisible space after the search widget field in notmuch-hello In-Reply-To: <8762nifmrq.fsf@praet.org> References: <1309768024-14584-1-git-send-email-dmitry.kurochkin@gmail.com> <8762nifmrq.fsf@praet.org> User-Agent: Notmuch/0.5-321-g41686e2 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Mon, 04 Jul 2011 13:08:43 +0400 Message-ID: <87r56676qs.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: Mon, 04 Jul 2011 09:08:53 -0000 On Mon, 04 Jul 2011 10:55:21 +0200, Pieter Praet wrote: > On Mon, 4 Jul 2011 12:27:04 +0400, Dmitry Kurochkin wrote: > > It is very convenient when C-e (bound to `widget-end-of-line') ignores > > trailing spaces inside the search widget. But it only does so if a > > widget is not followed by a newline (that is why it works in the saved > > search widgets). The patch just adds an insisible space after the > > search widget to get the desirable behavior of `widget-end-of-line'. > > > > Previous behavior of C-e: > > > > Search: [text _] > > > > Now: > > > > Search: [text_ ] > > > > The extra space is also added to expected results of emacs tests. > > --- > > > > Amended version with a better commit message. Stolen from a similar > > patch by Kan-Ru Chen [1] as suggested by Pieter Praet :) > > Muhahaaa! > > > Regards, > > Dmitry > > > > [1] id:"1280195325-9066-2-git-send-email-kanru@kanru.info" > > > > emacs/notmuch-hello.el | 4 ++++ > > test/emacs.expected-output/notmuch-hello | 2 +- > > .../notmuch-hello-no-saved-searches | 2 +- > > .../emacs.expected-output/notmuch-hello-with-empty | 2 +- > > 4 files changed, 7 insertions(+), 3 deletions(-) > > > > diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el > > index 65fde75..1a76c30 100644 > > --- a/emacs/notmuch-hello.el > > +++ b/emacs/notmuch-hello.el > > @@ -462,6 +462,10 @@ Complete list of currently available key bindings: > > (length "Search: "))) > > :action (lambda (widget &rest ignore) > > (notmuch-hello-search (widget-value widget)))) > > + ;; add an invisible space to make `widget-end-of-line' ignore > > + ;; trailine spaces in the search widget field > > + (widget-insert " ") > > + (put-text-property (1- (point)) (point) 'invisible t) > > (widget-insert "\n") > > > > (when notmuch-hello-recent-searches > > diff --git a/test/emacs.expected-output/notmuch-hello b/test/emacs.expected-output/notmuch-hello > > index 64b7e42..48143bd 100644 > > --- a/test/emacs.expected-output/notmuch-hello > > +++ b/test/emacs.expected-output/notmuch-hello > > @@ -4,7 +4,7 @@ Saved searches: [edit] > > > > 50 inbox 50 unread > > > > -Search: > > +Search: > > > > [Show all tags] > > > > diff --git a/test/emacs.expected-output/notmuch-hello-no-saved-searches b/test/emacs.expected-output/notmuch-hello-no-saved-searches > > index 7f8206a..7c09e40 100644 > > --- a/test/emacs.expected-output/notmuch-hello-no-saved-searches > > +++ b/test/emacs.expected-output/notmuch-hello-no-saved-searches > > @@ -1,6 +1,6 @@ > > Welcome to notmuch. You have 50 messages. > > > > -Search: > > +Search: > > > > [Show all tags] > > > > diff --git a/test/emacs.expected-output/notmuch-hello-with-empty b/test/emacs.expected-output/notmuch-hello-with-empty > > index a9ed630..2a267c9 100644 > > --- a/test/emacs.expected-output/notmuch-hello-with-empty > > +++ b/test/emacs.expected-output/notmuch-hello-with-empty > > @@ -4,7 +4,7 @@ Saved searches: [edit] > > > > 50 inbox 50 unread 0 empty > > > > -Search: > > +Search: > > > > [Show all tags] > > > > -- > > 1.7.5.4 > > > > _______________________________________________ > > notmuch mailing list > > notmuch@notmuchmail.org > > http://notmuchmail.org/mailman/listinfo/notmuch > > Signed-off-by: Pieter Praet > > > Would this be the right place to promote two of your previous patches [1,2] ? > > They serve as ears when using eye protection against `show-trailing-whitespace'. > I am glad somebody uses it except for me :) I use them exactly for the same reason. They are not ready for mainline. Two issues: * Poor commit message should be improved to make Carl happy. * I have wrote them long ago, and I am not sure it is a proper implementation. I need to double check that before asking Carl to push it. Or somebody else with a better elisp knowledge should review and approve it. I have been delaying this for some time. Since now I know somebody actually uses it, I may get to it sooner rather than later. But no promises. BTW I am not really sure that hooks are the best solution for turning off `show-trailing-whitespace'. Perhaps there is a better way? Would appreciate comments. (Though, hooks would be useful anyway.) Regards, Dmitry > > Peace > > -- > Pieter > > [1] id:"1278000507-22290-5-git-send-email-dmitry.kurochkin@gmail.com" > [2] id:"1278000507-22290-6-git-send-email-dmitry.kurochkin@gmail.com"