[PATCH 2/2] emacs: fix off-by-one error in notmuch-hello column alignment
authorDmitry Kurochkin <dmitry.kurochkin@gmail.com>
Fri, 9 Mar 2012 07:34:53 +0000 (11:34 +0400)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 17:45:20 +0000 (09:45 -0800)
ee/cd4e5b455a7175e76e2afca51b58fff5bc9b78 [new file with mode: 0644]

diff --git a/ee/cd4e5b455a7175e76e2afca51b58fff5bc9b78 b/ee/cd4e5b455a7175e76e2afca51b58fff5bc9b78
new file mode 100644 (file)
index 0000000..3777a8a
--- /dev/null
@@ -0,0 +1,119 @@
+Return-Path: <dmitry.kurochkin@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id CB016431FBC\r
+       for <notmuch@notmuchmail.org>; Thu,  8 Mar 2012 23:36:27 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id hzpoRtlagdTV for <notmuch@notmuchmail.org>;\r
+       Thu,  8 Mar 2012 23:36:27 -0800 (PST)\r
+Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com\r
+       [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 233B3431FAE\r
+       for <notmuch@notmuchmail.org>; Thu,  8 Mar 2012 23:36:26 -0800 (PST)\r
+Received: by mail-bk0-f53.google.com with SMTP id j4so1103545bkw.26\r
+       for <notmuch@notmuchmail.org>; Thu, 08 Mar 2012 23:36:26 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=+RQYjmMnB/9+q0O5IZ7OOca/RVo5yq/l1IAdZedn7oU=;\r
+       b=ovuggsm2lRa3BKU5UdcKDB9CK268Q7H5nKIlRkCLTFb5InhE37fbz7X103+23les2M\r
+       0GUOSobfAo9c6FNa9pWm8dm5/y1RP3QpNYURG6cZyjeLnTM5Gz9VZAV4e4FK3zk/C3jy\r
+       zYenm3hDW0pWHGtAybp3IFONzaB4TCsr3uIPDdGtcmqi1flfQFCHSPqrtYHuwl1KIJQw\r
+       HD/ryBHIz7Nnb9VhhQR6wqvYNcVmfK87DcmFISR7/Yuyz5RMSl/r5mBuVMm4j9HVJXmG\r
+       K/nEBJF02HhwZwe8ehHgewZxJ+Gz6C5kO3yQwa09uxcdi77N9jkz2QzuHs/AyBWmWLHr\r
+       PzkQ==\r
+Received: by 10.204.130.76 with SMTP id r12mr454490bks.80.1331278586775;\r
+       Thu, 08 Mar 2012 23:36:26 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id jc4sm7572092bkc.7.2012.03.08.23.36.25\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Thu, 08 Mar 2012 23:36:26 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] emacs: fix off-by-one error in notmuch-hello column\r
+       alignment\r
+Date: Fri,  9 Mar 2012 11:34:53 +0400\r
+Message-Id: <1331278493-16996-2-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1331278493-16996-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1331278493-16996-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 09 Mar 2012 07:36:27 -0000\r
+\r
+Expected results for few tests are fixed, the relevant test is\r
+unmarked broken.\r
+---\r
+ emacs/notmuch-hello.el                             |    2 +-\r
+ test/emacs-hello                                   |    1 -\r
+ .../notmuch-hello-new-section                      |    2 +-\r
+ .../notmuch-hello-section-with-empty               |    2 +-\r
+ 4 files changed, 3 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+index e9caade..28f39f1 100644\r
+--- a/emacs/notmuch-hello.el\r
++++ b/emacs/notmuch-hello.el\r
+@@ -461,7 +461,7 @@ Such a list can be computed with `notmuch-hello-query-counts'."\r
+                 ;; just insert `(- widest (length name))' spaces - the\r
+                 ;; column separator is included in the button if\r
+                 ;; `(equal widest (length name)'.\r
+-                (widget-insert (make-string (max 1\r
++                (widget-insert (make-string (max 0\r
+                                                  (- widest (length name)))\r
+                                             ? )))))\r
+           (setq count (1+ count))\r
+diff --git a/test/emacs-hello b/test/emacs-hello\r
+index 9e5d045..be66ba4 100755\r
+--- a/test/emacs-hello\r
++++ b/test/emacs-hello\r
+@@ -45,7 +45,6 @@ test_emacs "(let ((notmuch-hello-sections\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-counts\r
+ \r
+ test_begin_subtest "Column alignment for tag/queries with long names"\r
+-test_subtest_known_broken\r
+ tag=a-very-long-tag # length carefully calculated for 80 characters window width\r
+ notmuch tag +$tag '*'\r
+ test_emacs '(notmuch-hello)\r
+diff --git a/test/emacs.expected-output/notmuch-hello-new-section b/test/emacs.expected-output/notmuch-hello-new-section\r
+index c64d712..6a339aa 100644\r
+--- a/test/emacs.expected-output/notmuch-hello-new-section\r
++++ b/test/emacs.expected-output/notmuch-hello-new-section\r
+@@ -1,4 +1,4 @@\r
+ Test: [hide]\r
+ \r
+-        52 inbox  \r
++        52 inbox \r
+ \r
+diff --git a/test/emacs.expected-output/notmuch-hello-section-with-empty b/test/emacs.expected-output/notmuch-hello-section-with-empty\r
+index 8209fed..dc2568d 100644\r
+--- a/test/emacs.expected-output/notmuch-hello-section-with-empty\r
++++ b/test/emacs.expected-output/notmuch-hello-section-with-empty\r
+@@ -1,4 +1,4 @@\r
+ Test-with-empty: [hide]\r
+ \r
+-        52 inbox  \r
++        52 inbox \r
+ \r
+-- \r
+1.7.9.1\r
+\r