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