[PATCH v2 4/7] emacs: rename `notmuch-show-toggle-message' to `notmuch-show-toggle...

diff --git a/5a/3acde83ede9dddfaf6c23b5e490228ea806ef7 b/5a/3acde83ede9dddfaf6c23b5e490228ea806ef7
new file mode 100644 (file)
index 0000000..6bf1589
--- /dev/null
+++ b/5a/3acde83ede9dddfaf6c23b5e490228ea806ef7
@@ -0,0 +1,142 @@
+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 CE4B5431FD2\r
+       for <notmuch@notmuchmail.org>; Wed, 22 Feb 2012 10:45:58 -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 MAEjtYbla8bX for <notmuch@notmuchmail.org>;\r
+       Wed, 22 Feb 2012 10:45:58 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+       [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id C7EE6431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 22 Feb 2012 10:45:57 -0800 (PST)\r
+Received: by wibhi8 with SMTP id hi8so270712wib.26\r
+       for <notmuch@notmuchmail.org>; Wed, 22 Feb 2012 10:45:56 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of pieter@praet.org designates\r
+       10.180.92.227 as permitted sender) client-ip=10.180.92.227; \r
+Authentication-Results: mr.google.com;\r
+       spf=pass (google.com: domain of pieter@praet.org\r
+       designates 10.180.92.227 as permitted sender)\r
+       smtp.mail=pieter@praet.org\r
+Received: from mr.google.com ([10.180.92.227])\r
+       by 10.180.92.227 with SMTP id cp3mr38270978wib.13.1329936356699\r
+       (num_hops = 1); Wed, 22 Feb 2012 10:45:56 -0800 (PST)\r
+MIME-Version: 1.0\r
+Received: by 10.180.92.227 with SMTP id cp3mr31658037wib.13.1329936356640;\r
+       Wed, 22 Feb 2012 10:45:56 -0800 (PST)\r
+Received: from localhost ([109.131.181.26])\r
+       by mx.google.com with ESMTPS id dw7sm30958100wib.4.2012.02.22.10.45.55\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 22 Feb 2012 10:45:56 -0800 (PST)\r
+From: Pieter Praet <pieter@praet.org>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH v2 4/7] emacs: rename `notmuch-show-toggle-message' to\r
+       `notmuch-show-toggle-visibility-message'\r
+Date: Wed, 22 Feb 2012 19:43:31 +0100\r
+Message-Id: <1329936214-30959-4-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
+ ALoCoQmJSZ4AikrGX1BykszlMM+sAbPl45/ufzQfT2YrsCiBXZx8VlrJc6LgpIQvcdVFHrNntK8x\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:45:59 -0000\r
+\r
+* emacs/notmuch-show.el\r
+\r
+  (notmuch-show-toggle-message):\r
+    Rename to `notmuch-show-toggle-visibility-message'.\r
+\r
+  (notmuch-show-mode-map):\r
+    Update "RET" binding wrt renamed `notmuch-show-toggle-message'.\r
+\r
+* test/emacs:\r
+\r
+  Update subtests wrt renamed `notmuch-show-toggle-message':\r
+  - "Hiding message in notmuch-show view"\r
+  - "Hiding message with visible citation in notmuch-show view"\r
+  - "Refresh modified show buffer"\r
+---\r
+ emacs/notmuch-show.el |    4 ++--\r
+ test/emacs            |    8 ++++----\r
+ 2 files changed, 6 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 861018d..9b879c7 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1183,7 +1183,7 @@ (defvar notmuch-show-mode-map\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-message)\r
++      (define-key map (kbd "RET") 'notmuch-show-toggle-visibility-message)\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
+@@ -1659,7 +1659,7 @@ (defun notmuch-show-toggle-visibility-headers ()\r
+      (not (plist-get props :headers-visible))))\r
+   (force-window-update))\r
+ \r
+-(defun notmuch-show-toggle-message ()\r
++(defun notmuch-show-toggle-visibility-message ()\r
+   "Toggle the visibility of the current message."\r
+   (interactive)\r
+   (let ((props (notmuch-show-get-message-properties)))\r
+diff --git a/test/emacs b/test/emacs\r
+index f17efbd..6f14895 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -371,7 +371,7 @@ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "Hiding message in notmuch-show view"\r
+ test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com")\r
+-          (notmuch-show-toggle-message)\r
++          (notmuch-show-toggle-visibility-message)\r
+           (test-visible-output)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-hidden-messages\r
+ \r
+@@ -379,7 +379,7 @@ test_begin_subtest "Hiding message with visible citation in notmuch-show view"\r
+ test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com")\r
+           (search-forward "Click/Enter to show.")\r
+           (button-activate (button-at (point)))\r
+-          (notmuch-show-toggle-message)\r
++          (notmuch-show-toggle-visibility-message)\r
+           (test-visible-output)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-hidden-messages\r
+ \r
+@@ -496,9 +496,9 @@ test_expect_equal_file OUTPUT EXPECTED\r
+ test_begin_subtest "Refresh modified show buffer"\r
+ test_subtest_known_broken\r
+ test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com")\r
+-          (notmuch-show-toggle-message)\r
++          (notmuch-show-toggle-visibility-message)\r
+           (notmuch-show-next-message)\r
+-          (notmuch-show-toggle-message)\r
++          (notmuch-show-toggle-visibility-message)\r
+           (test-visible-output "EXPECTED")\r
+           (notmuch-show-refresh-view)\r
+           (test-visible-output)'\r
+-- \r
+1.7.8.1\r
+\r