d1/29b99a96ff3efb1de1962a1f7604b71260b80e

   1 Return-Path: <dmitry.kurochkin@gmail.com>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 93BEA431FD0\r
   6         for <notmuch@notmuchmail.org>; Mon,  4 Jul 2011 01:27:20 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.799\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id K8P+t+ftcmNj for <notmuch@notmuchmail.org>;\r
  17         Mon,  4 Jul 2011 01:27:19 -0700 (PDT)\r
  18 Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com\r
  19         [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 7B640431FB6\r
  22         for <notmuch@notmuchmail.org>; Mon,  4 Jul 2011 01:27:19 -0700 (PDT)\r
  23 Received: by bwg12 with SMTP id 12so4578924bwg.26\r
  24         for <notmuch@notmuchmail.org>; Mon, 04 Jul 2011 01:27:18 -0700 (PDT)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
  26         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
  27         bh=hfSJcmKR8NJCE/EukYCUh4teIVt9RZnjZja6AYQeq/Q=;\r
  28         b=hxnfTFrUmv6QEYBvJ/jMTFlExY1AVMaRT+TYpotPQEbGeROflXGUWumI/lGm7xgJEm\r
  29         q5OyROyQ02x3tMLG9ENoXVTPAJmxZVLP7Kt3Y0KcOA4uwBMlhKg9jMGyRi8NLxQHep2a\r
  30         xm++Lc25akVj8CcaM456q3kG5XOMFYCf6/KJA=\r
  31 Received: by 10.204.141.205 with SMTP id n13mr1792419bku.198.1309768038128;\r
  32         Mon, 04 Jul 2011 01:27:18 -0700 (PDT)\r
  33 Received: from localhost ([91.144.186.21])\r
  34         by mx.google.com with ESMTPS id k16sm5345387bks.1.2011.07.04.01.27.16\r
  35         (version=TLSv1/SSLv3 cipher=OTHER);\r
  36         Mon, 04 Jul 2011 01:27:17 -0700 (PDT)\r
  37 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH v2] emacs: add insisible space after the search widget field\r
  40         in notmuch-hello\r
  41 Date: Mon,  4 Jul 2011 12:27:04 +0400\r
  42 Message-Id: <1309768024-14584-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  43 X-Mailer: git-send-email 1.7.5.4\r
  44 In-Reply-To: <id:1309762025-1172-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  45 References: <id:1309762025-1172-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  46 X-BeenThere: notmuch@notmuchmail.org\r
  47 X-Mailman-Version: 2.1.13\r
  48 Precedence: list\r
  49 List-Id: "Use and development of the notmuch mail system."\r
  50         <notmuch.notmuchmail.org>\r
  51 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  52         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  53 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  54 List-Post: <mailto:notmuch@notmuchmail.org>\r
  55 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  56 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  57         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  58 X-List-Received-Date: Mon, 04 Jul 2011 08:27:20 -0000\r
  59 \r
  60 It is very convenient when C-e (bound to `widget-end-of-line') ignores\r
  61 trailing spaces inside the search widget.  But it only does so if a\r
  62 widget is not followed by a newline (that is why it works in the saved\r
  63 search widgets).  The patch just adds an insisible space after the\r
  64 search widget to get the desirable behavior of `widget-end-of-line'.\r
  65 \r
  66 Previous behavior of C-e:\r
  67 \r
  68   Search: [text                _]\r
  69 \r
  70 Now:\r
  71 \r
  72   Search: [text_                ]\r
  73 \r
  74 The extra space is also added to expected results of emacs tests.\r
  75 ---\r
  76 \r
  77 Amended version with a better commit message.  Stolen from a similar\r
  78 patch by Kan-Ru Chen [1] as suggested by Pieter Praet :)\r
  79 \r
  80 Regards,\r
  81   Dmitry\r
  82 \r
  83 [1] id:"1280195325-9066-2-git-send-email-kanru@kanru.info"\r
  84 \r
  85  emacs/notmuch-hello.el                             |    4 ++++\r
  86  test/emacs.expected-output/notmuch-hello           |    2 +-\r
  87  .../notmuch-hello-no-saved-searches                |    2 +-\r
  88  .../emacs.expected-output/notmuch-hello-with-empty |    2 +-\r
  89  4 files changed, 7 insertions(+), 3 deletions(-)\r
  90 \r
  91 diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
  92 index 65fde75..1a76c30 100644\r
  93 --- a/emacs/notmuch-hello.el\r
  94 +++ b/emacs/notmuch-hello.el\r
  95 @@ -462,6 +462,10 @@ Complete list of currently available key bindings:\r
  96                                        (length "Search: ")))\r
  97                        :action (lambda (widget &rest ignore)\r
  98                                  (notmuch-hello-search (widget-value widget))))\r
  99 +       ;; add an invisible space to make `widget-end-of-line' ignore\r
 100 +       ;; trailine spaces in the search widget field\r
 101 +       (widget-insert " ")\r
 102 +       (put-text-property (1- (point)) (point) 'invisible t)\r
 103         (widget-insert "\n")\r
 104  \r
 105         (when notmuch-hello-recent-searches\r
 106 diff --git a/test/emacs.expected-output/notmuch-hello b/test/emacs.expected-output/notmuch-hello\r
 107 index 64b7e42..48143bd 100644\r
 108 --- a/test/emacs.expected-output/notmuch-hello\r
 109 +++ b/test/emacs.expected-output/notmuch-hello\r
 110 @@ -4,7 +4,7 @@ Saved searches: [edit]\r
 111  \r
 112           50 inbox           50 unread    \r
 113  \r
 114 -Search:                                                                     \r
 115 +Search:                                                                      \r
 116  \r
 117  [Show all tags]\r
 118  \r
 119 diff --git a/test/emacs.expected-output/notmuch-hello-no-saved-searches b/test/emacs.expected-output/notmuch-hello-no-saved-searches\r
 120 index 7f8206a..7c09e40 100644\r
 121 --- a/test/emacs.expected-output/notmuch-hello-no-saved-searches\r
 122 +++ b/test/emacs.expected-output/notmuch-hello-no-saved-searches\r
 123 @@ -1,6 +1,6 @@\r
 124     Welcome to notmuch. You have 50 messages.\r
 125  \r
 126 -Search:                                                                     \r
 127 +Search:                                                                      \r
 128  \r
 129  [Show all tags]\r
 130  \r
 131 diff --git a/test/emacs.expected-output/notmuch-hello-with-empty b/test/emacs.expected-output/notmuch-hello-with-empty\r
 132 index a9ed630..2a267c9 100644\r
 133 --- a/test/emacs.expected-output/notmuch-hello-with-empty\r
 134 +++ b/test/emacs.expected-output/notmuch-hello-with-empty\r
 135 @@ -4,7 +4,7 @@ Saved searches: [edit]\r
 136  \r
 137           50 inbox           50 unread           0 empty     \r
 138  \r
 139 -Search:                                                                     \r
 140 +Search:                                                                      \r
 141  \r
 142  [Show all tags]\r
 143  \r
 144 -- \r
 145 1.7.5.4\r
 146 \r