From: Pieter Praet Date: Wed, 22 Feb 2012 18:43:31 +0000 (+0100) Subject: [PATCH v2 4/7] emacs: rename `notmuch-show-toggle-message' to `notmuch-show-toggle... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d5902fb0a76eb7b7b1771921df611b3543449d06;p=notmuch-archives.git [PATCH v2 4/7] emacs: rename `notmuch-show-toggle-message' to `notmuch-show-toggle-visibility-message' --- diff --git a/5a/3acde83ede9dddfaf6c23b5e490228ea806ef7 b/5a/3acde83ede9dddfaf6c23b5e490228ea806ef7 new file mode 100644 index 000000000..6bf1589fa --- /dev/null +++ b/5a/3acde83ede9dddfaf6c23b5e490228ea806ef7 @@ -0,0 +1,142 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id CE4B5431FD2 + for ; Wed, 22 Feb 2012 10:45:58 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id MAEjtYbla8bX for ; + Wed, 22 Feb 2012 10:45:58 -0800 (PST) +Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com + [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id C7EE6431FB6 + for ; Wed, 22 Feb 2012 10:45:57 -0800 (PST) +Received: by wibhi8 with SMTP id hi8so270712wib.26 + for ; Wed, 22 Feb 2012 10:45:56 -0800 (PST) +Received-SPF: pass (google.com: domain of pieter@praet.org designates + 10.180.92.227 as permitted sender) client-ip=10.180.92.227; +Authentication-Results: mr.google.com; + spf=pass (google.com: domain of pieter@praet.org + designates 10.180.92.227 as permitted sender) + smtp.mail=pieter@praet.org +Received: from mr.google.com ([10.180.92.227]) + by 10.180.92.227 with SMTP id cp3mr38270978wib.13.1329936356699 + (num_hops = 1); Wed, 22 Feb 2012 10:45:56 -0800 (PST) +MIME-Version: 1.0 +Received: by 10.180.92.227 with SMTP id cp3mr31658037wib.13.1329936356640; + Wed, 22 Feb 2012 10:45:56 -0800 (PST) +Received: from localhost ([109.131.181.26]) + by mx.google.com with ESMTPS id dw7sm30958100wib.4.2012.02.22.10.45.55 + (version=TLSv1/SSLv3 cipher=OTHER); + Wed, 22 Feb 2012 10:45:56 -0800 (PST) +From: Pieter Praet +To: Notmuch Mail +Subject: [PATCH v2 4/7] emacs: rename `notmuch-show-toggle-message' to + `notmuch-show-toggle-visibility-message' +Date: Wed, 22 Feb 2012 19:43:31 +0100 +Message-Id: <1329936214-30959-4-git-send-email-pieter@praet.org> +X-Mailer: git-send-email 1.7.8.1 +In-Reply-To: <1327469139-1968-1-git-send-email-pieter@praet.org> +References: <1327469139-1968-1-git-send-email-pieter@praet.org> +X-Gm-Message-State: + ALoCoQmJSZ4AikrGX1BykszlMM+sAbPl45/ufzQfT2YrsCiBXZx8VlrJc6LgpIQvcdVFHrNntK8x +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 22 Feb 2012 18:45:59 -0000 + +* emacs/notmuch-show.el + + (notmuch-show-toggle-message): + Rename to `notmuch-show-toggle-visibility-message'. + + (notmuch-show-mode-map): + Update "RET" binding wrt renamed `notmuch-show-toggle-message'. + +* test/emacs: + + Update subtests wrt renamed `notmuch-show-toggle-message': + - "Hiding message in notmuch-show view" + - "Hiding message with visible citation in notmuch-show view" + - "Refresh modified show buffer" +--- + emacs/notmuch-show.el | 4 ++-- + test/emacs | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 861018d..9b879c7 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1183,7 +1183,7 @@ (defvar notmuch-show-mode-map + (define-key map (kbd "DEL") 'notmuch-show-rewind) + (define-key map " " 'notmuch-show-advance-and-archive) + (define-key map (kbd "M-RET") 'notmuch-show-open-or-close-all) +- (define-key map (kbd "RET") 'notmuch-show-toggle-message) ++ (define-key map (kbd "RET") 'notmuch-show-toggle-visibility-message) + (define-key map "#" 'notmuch-show-print-message) + (define-key map "!" 'notmuch-show-toggle-elide-non-matching) + (define-key map "$" 'notmuch-show-toggle-process-crypto) +@@ -1659,7 +1659,7 @@ (defun notmuch-show-toggle-visibility-headers () + (not (plist-get props :headers-visible)))) + (force-window-update)) + +-(defun notmuch-show-toggle-message () ++(defun notmuch-show-toggle-visibility-message () + "Toggle the visibility of the current message." + (interactive) + (let ((props (notmuch-show-get-message-properties))) +diff --git a/test/emacs b/test/emacs +index f17efbd..6f14895 100755 +--- a/test/emacs ++++ b/test/emacs +@@ -371,7 +371,7 @@ test_expect_equal_file OUTPUT EXPECTED + + test_begin_subtest "Hiding message in notmuch-show view" + test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com") +- (notmuch-show-toggle-message) ++ (notmuch-show-toggle-visibility-message) + (test-visible-output)' + test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-hidden-messages + +@@ -379,7 +379,7 @@ test_begin_subtest "Hiding message with visible citation in notmuch-show view" + test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com") + (search-forward "Click/Enter to show.") + (button-activate (button-at (point))) +- (notmuch-show-toggle-message) ++ (notmuch-show-toggle-visibility-message) + (test-visible-output)' + test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-hidden-messages + +@@ -496,9 +496,9 @@ test_expect_equal_file OUTPUT EXPECTED + test_begin_subtest "Refresh modified show buffer" + test_subtest_known_broken + test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com") +- (notmuch-show-toggle-message) ++ (notmuch-show-toggle-visibility-message) + (notmuch-show-next-message) +- (notmuch-show-toggle-message) ++ (notmuch-show-toggle-visibility-message) + (test-visible-output "EXPECTED") + (notmuch-show-refresh-view) + (test-visible-output)' +-- +1.7.8.1 +