1 Return-Path: <pieter@praet.org>
\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 CE4B5431FD2
\r
6 for <notmuch@notmuchmail.org>; Wed, 22 Feb 2012 10:45:58 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id MAEjtYbla8bX for <notmuch@notmuchmail.org>;
\r
16 Wed, 22 Feb 2012 10:45:58 -0800 (PST)
\r
17 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com
\r
18 [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id C7EE6431FB6
\r
21 for <notmuch@notmuchmail.org>; Wed, 22 Feb 2012 10:45:57 -0800 (PST)
\r
22 Received: by wibhi8 with SMTP id hi8so270712wib.26
\r
23 for <notmuch@notmuchmail.org>; Wed, 22 Feb 2012 10:45:56 -0800 (PST)
\r
24 Received-SPF: pass (google.com: domain of pieter@praet.org designates
\r
25 10.180.92.227 as permitted sender) client-ip=10.180.92.227;
\r
26 Authentication-Results: mr.google.com;
\r
27 spf=pass (google.com: domain of pieter@praet.org
\r
28 designates 10.180.92.227 as permitted sender)
\r
29 smtp.mail=pieter@praet.org
\r
30 Received: from mr.google.com ([10.180.92.227])
\r
31 by 10.180.92.227 with SMTP id cp3mr38270978wib.13.1329936356699
\r
32 (num_hops = 1); Wed, 22 Feb 2012 10:45:56 -0800 (PST)
\r
34 Received: by 10.180.92.227 with SMTP id cp3mr31658037wib.13.1329936356640;
\r
35 Wed, 22 Feb 2012 10:45:56 -0800 (PST)
\r
36 Received: from localhost ([109.131.181.26])
\r
37 by mx.google.com with ESMTPS id dw7sm30958100wib.4.2012.02.22.10.45.55
\r
38 (version=TLSv1/SSLv3 cipher=OTHER);
\r
39 Wed, 22 Feb 2012 10:45:56 -0800 (PST)
\r
40 From: Pieter Praet <pieter@praet.org>
\r
41 To: Notmuch Mail <notmuch@notmuchmail.org>
\r
42 Subject: [PATCH v2 4/7] emacs: rename `notmuch-show-toggle-message' to
\r
43 `notmuch-show-toggle-visibility-message'
\r
44 Date: Wed, 22 Feb 2012 19:43:31 +0100
\r
45 Message-Id: <1329936214-30959-4-git-send-email-pieter@praet.org>
\r
46 X-Mailer: git-send-email 1.7.8.1
\r
47 In-Reply-To: <1327469139-1968-1-git-send-email-pieter@praet.org>
\r
48 References: <1327469139-1968-1-git-send-email-pieter@praet.org>
\r
50 ALoCoQmJSZ4AikrGX1BykszlMM+sAbPl45/ufzQfT2YrsCiBXZx8VlrJc6LgpIQvcdVFHrNntK8x
\r
51 X-BeenThere: notmuch@notmuchmail.org
\r
52 X-Mailman-Version: 2.1.13
\r
54 List-Id: "Use and development of the notmuch mail system."
\r
55 <notmuch.notmuchmail.org>
\r
56 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
58 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
59 List-Post: <mailto:notmuch@notmuchmail.org>
\r
60 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
61 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
62 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
63 X-List-Received-Date: Wed, 22 Feb 2012 18:45:59 -0000
\r
65 * emacs/notmuch-show.el
\r
67 (notmuch-show-toggle-message):
\r
68 Rename to `notmuch-show-toggle-visibility-message'.
\r
70 (notmuch-show-mode-map):
\r
71 Update "RET" binding wrt renamed `notmuch-show-toggle-message'.
\r
75 Update subtests wrt renamed `notmuch-show-toggle-message':
\r
76 - "Hiding message in notmuch-show view"
\r
77 - "Hiding message with visible citation in notmuch-show view"
\r
78 - "Refresh modified show buffer"
\r
80 emacs/notmuch-show.el | 4 ++--
\r
81 test/emacs | 8 ++++----
\r
82 2 files changed, 6 insertions(+), 6 deletions(-)
\r
84 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
85 index 861018d..9b879c7 100644
\r
86 --- a/emacs/notmuch-show.el
\r
87 +++ b/emacs/notmuch-show.el
\r
88 @@ -1183,7 +1183,7 @@ (defvar notmuch-show-mode-map
\r
89 (define-key map (kbd "DEL") 'notmuch-show-rewind)
\r
90 (define-key map " " 'notmuch-show-advance-and-archive)
\r
91 (define-key map (kbd "M-RET") 'notmuch-show-open-or-close-all)
\r
92 - (define-key map (kbd "RET") 'notmuch-show-toggle-message)
\r
93 + (define-key map (kbd "RET") 'notmuch-show-toggle-visibility-message)
\r
94 (define-key map "#" 'notmuch-show-print-message)
\r
95 (define-key map "!" 'notmuch-show-toggle-elide-non-matching)
\r
96 (define-key map "$" 'notmuch-show-toggle-process-crypto)
\r
97 @@ -1659,7 +1659,7 @@ (defun notmuch-show-toggle-visibility-headers ()
\r
98 (not (plist-get props :headers-visible))))
\r
99 (force-window-update))
\r
101 -(defun notmuch-show-toggle-message ()
\r
102 +(defun notmuch-show-toggle-visibility-message ()
\r
103 "Toggle the visibility of the current message."
\r
105 (let ((props (notmuch-show-get-message-properties)))
\r
106 diff --git a/test/emacs b/test/emacs
\r
107 index f17efbd..6f14895 100755
\r
110 @@ -371,7 +371,7 @@ test_expect_equal_file OUTPUT EXPECTED
\r
112 test_begin_subtest "Hiding message in notmuch-show view"
\r
113 test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com")
\r
114 - (notmuch-show-toggle-message)
\r
115 + (notmuch-show-toggle-visibility-message)
\r
116 (test-visible-output)'
\r
117 test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-hidden-messages
\r
119 @@ -379,7 +379,7 @@ test_begin_subtest "Hiding message with visible citation in notmuch-show view"
\r
120 test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com")
\r
121 (search-forward "Click/Enter to show.")
\r
122 (button-activate (button-at (point)))
\r
123 - (notmuch-show-toggle-message)
\r
124 + (notmuch-show-toggle-visibility-message)
\r
125 (test-visible-output)'
\r
126 test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-hidden-messages
\r
128 @@ -496,9 +496,9 @@ test_expect_equal_file OUTPUT EXPECTED
\r
129 test_begin_subtest "Refresh modified show buffer"
\r
130 test_subtest_known_broken
\r
131 test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com")
\r
132 - (notmuch-show-toggle-message)
\r
133 + (notmuch-show-toggle-visibility-message)
\r
134 (notmuch-show-next-message)
\r
135 - (notmuch-show-toggle-message)
\r
136 + (notmuch-show-toggle-visibility-message)
\r
137 (test-visible-output "EXPECTED")
\r
138 (notmuch-show-refresh-view)
\r
139 (test-visible-output)'
\r