[PATCH v2 5/7] emacs: rename `notmuch-show-open-or-close-all' to `notmuch-show-toggle...

diff --git a/d8/78390545a7d7d8dcf606848f33839da65d86bb b/d8/78390545a7d7d8dcf606848f33839da65d86bb
new file mode 100644 (file)
index 0000000..9ccd33e
--- /dev/null
+++ b/d8/78390545a7d7d8dcf606848f33839da65d86bb
@@ -0,0 +1,128 @@
+Return-Path: <pieter@praet.org>\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 A44CA431FC3\r
+       for <notmuch@notmuchmail.org>; Wed, 22 Feb 2012 10:46:05 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 vGsfZlXCy3lJ for <notmuch@notmuchmail.org>;\r
+       Wed, 22 Feb 2012 10:46:04 -0800 (PST)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 40485431FC7\r
+       for <notmuch@notmuchmail.org>; Wed, 22 Feb 2012 10:45:58 -0800 (PST)\r
+Received: by mail-we0-f181.google.com with SMTP id p13so266664wer.26\r
+       for <notmuch@notmuchmail.org>; Wed, 22 Feb 2012 10:45:57 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of pieter@praet.org designates\r
+       10.180.7.231 as permitted sender) client-ip=10.180.7.231; \r
+Authentication-Results: mr.google.com;\r
+       spf=pass (google.com: domain of pieter@praet.org\r
+       designates 10.180.7.231 as permitted sender)\r
+       smtp.mail=pieter@praet.org\r
+Received: from mr.google.com ([10.180.7.231])\r
+       by 10.180.7.231 with SMTP id m7mr48959377wia.3.1329936357968 (num_hops\r
+       = 1); Wed, 22 Feb 2012 10:45:57 -0800 (PST)\r
+MIME-Version: 1.0\r
+Received: by 10.180.7.231 with SMTP id m7mr40538925wia.3.1329936357896;\r
+       Wed, 22 Feb 2012 10:45:57 -0800 (PST)\r
+Received: from localhost ([109.131.181.26])\r
+       by mx.google.com with ESMTPS id gf3sm29438138wib.6.2012.02.22.10.45.57\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 22 Feb 2012 10:45:57 -0800 (PST)\r
+From: Pieter Praet <pieter@praet.org>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH v2 5/7] emacs: rename `notmuch-show-open-or-close-all' to\r
+       `notmuch-show-toggle-visibility-messages'\r
+Date: Wed, 22 Feb 2012 19:43:32 +0100\r
+Message-Id: <1329936214-30959-5-git-send-email-pieter@praet.org>\r
+X-Mailer: git-send-email 1.7.8.1\r
+In-Reply-To: <1327469139-1968-1-git-send-email-pieter@praet.org>\r
+References: <1327469139-1968-1-git-send-email-pieter@praet.org>\r
+X-Gm-Message-State:\r
+ ALoCoQn3VFNkTng0fbrsNWC8jbvZ+CkaoOySlZrQy0fAU4i7mgzWPVIvgqU24E4h+DigHSA3Xwbt\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: Wed, 22 Feb 2012 18:46:06 -0000\r
+\r
+* emacs/notmuch-show.el\r
+\r
+  (notmuch-show-open-or-close-all):\r
+    Rename to `notmuch-show-toggle-visibility-messages'.\r
+\r
+  (notmuch-show-mode-map):\r
+    Update "M-RET" binding wrt renamed `notmuch-show-open-or-close-all'.\r
+\r
+* test/emacs:\r
+\r
+  Update subtests wrt renamed `notmuch-show-open-or-close-all':\r
+  - "notmuch-show: collapse all messages in thread"\r
+  - "notmuch-show: uncollapse all messages in thread"\r
+---\r
+ emacs/notmuch-show.el |    4 ++--\r
+ test/emacs            |    4 ++--\r
+ 2 files changed, 4 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 9b879c7..e4d1f9c 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1182,8 +1182,8 @@ (defvar notmuch-show-mode-map\r
+       (define-key map "p" 'notmuch-show-previous-open-message)\r
+       (define-key map (kbd "DEL") 'notmuch-show-rewind)\r
+       (define-key map " " 'notmuch-show-advance-and-archive)\r
+-      (define-key map (kbd "M-RET") 'notmuch-show-open-or-close-all)\r
+       (define-key map (kbd "RET") 'notmuch-show-toggle-visibility-message)\r
++      (define-key map (kbd "M-RET") 'notmuch-show-toggle-visibility-messages)\r
+       (define-key map "#" 'notmuch-show-print-message)\r
+       (define-key map "!" 'notmuch-show-toggle-elide-non-matching)\r
+       (define-key map "$" 'notmuch-show-toggle-process-crypto)\r
+@@ -1668,7 +1668,7 @@ (defun notmuch-show-toggle-visibility-message ()\r
+      (not (plist-get props :message-visible))))\r
+   (force-window-update))\r
+ \r
+-(defun notmuch-show-open-or-close-all ()\r
++(defun notmuch-show-toggle-visibility-messages ()\r
+   "Set the visibility all of the messages in the current thread.\r
+ By default make all of the messages visible. With a prefix\r
+ argument, hide all of the messages."\r
+diff --git a/test/emacs b/test/emacs\r
+index 6f14895..29fdec0 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -411,13 +411,13 @@ test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-message-with-headers-hidden\r
+ test_begin_subtest "notmuch-show: collapse all messages in thread"\r
+ test_emacs '(notmuch-show "id:f35dbb950911171435ieecd458o853c873e35f4be95@mail.gmail.com")\r
+       (let ((current-prefix-arg t))\r
+-        (notmuch-show-open-or-close-all)\r
++        (notmuch-show-toggle-visibility-messages)\r
+         (test-visible-output))'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-all-messages-collapsed\r
+ \r
+ test_begin_subtest "notmuch-show: uncollapse all messages in thread"\r
+ test_emacs '(notmuch-show "id:f35dbb950911171435ieecd458o853c873e35f4be95@mail.gmail.com")\r
+-      (notmuch-show-open-or-close-all)\r
++      (notmuch-show-toggle-visibility-messages)\r
+       (test-visible-output)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-all-messages-uncollapsed\r
+ \r
+-- \r
+1.7.8.1\r
+\r