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 93BEA431FD0 for ; Mon, 4 Jul 2011 01:27:20 -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 K8P+t+ftcmNj for ; Mon, 4 Jul 2011 01:27:19 -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 7B640431FB6 for ; Mon, 4 Jul 2011 01:27:19 -0700 (PDT) Received: by bwg12 with SMTP id 12so4578924bwg.26 for ; Mon, 04 Jul 2011 01:27:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=hfSJcmKR8NJCE/EukYCUh4teIVt9RZnjZja6AYQeq/Q=; b=hxnfTFrUmv6QEYBvJ/jMTFlExY1AVMaRT+TYpotPQEbGeROflXGUWumI/lGm7xgJEm q5OyROyQ02x3tMLG9ENoXVTPAJmxZVLP7Kt3Y0KcOA4uwBMlhKg9jMGyRi8NLxQHep2a xm++Lc25akVj8CcaM456q3kG5XOMFYCf6/KJA= Received: by 10.204.141.205 with SMTP id n13mr1792419bku.198.1309768038128; Mon, 04 Jul 2011 01:27:18 -0700 (PDT) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id k16sm5345387bks.1.2011.07.04.01.27.16 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 04 Jul 2011 01:27:17 -0700 (PDT) From: Dmitry Kurochkin To: notmuch@notmuchmail.org Subject: [PATCH v2] emacs: add insisible space after the search widget field in notmuch-hello Date: Mon, 4 Jul 2011 12:27:04 +0400 Message-Id: <1309768024-14584-1-git-send-email-dmitry.kurochkin@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: References: 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:27:20 -0000 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 :) 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