From afa21d7ddc4dc1a9ffe2eadaf40f173612c7e098 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sun, 13 Oct 2013 08:39:12 +0100 Subject: [PATCH] [PATCH v2] emacs: show: use interactive instead of current-prefix-arg --- d9/74e5c4584caf1516e37ea3c4e42b0a6deabd6b | 175 ++++++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 d9/74e5c4584caf1516e37ea3c4e42b0a6deabd6b diff --git a/d9/74e5c4584caf1516e37ea3c4e42b0a6deabd6b b/d9/74e5c4584caf1516e37ea3c4e42b0a6deabd6b new file mode 100644 index 000000000..c3c223815 --- /dev/null +++ b/d9/74e5c4584caf1516e37ea3c4e42b0a6deabd6b @@ -0,0 +1,175 @@ +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 1B793431FAF + for ; Sun, 13 Oct 2013 00:39:39 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.7 +X-Spam-Level: ** +X-Spam-Status: No, score=2.7 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + FREEMAIL_REPLY=2.499, 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 bSK2La6b8A-U for ; + Sun, 13 Oct 2013 00:39:31 -0700 (PDT) +Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com + [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 54AC5431FAE + for ; Sun, 13 Oct 2013 00:39:31 -0700 (PDT) +Received: by mail-wi0-f173.google.com with SMTP id h11so866021wiv.12 + for ; Sun, 13 Oct 2013 00:39:30 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id; + bh=YqxiVOPYFrqRla8MpM1bOzYLWxXwRaC5ibFxhjr3Bdo=; + b=0sbkoYSak20hea9264b1bxxM3fBSKwI57Hcyhv38LWqROa9AUm7CFfKIA/ZtadihmZ + YiIZCXVqEMqhH1ivb1LwOpb+5stJP/UJjH2G6275D5u+OnoFMj/qdPl6OIXEZtmbpMJe + oe9gQJOBqkxH4ohLIZeRCI2KRiW3wuk5NP0oLc2roCyOTKp/9y7GcUCL8y/8/LfpjMPl + tc00/0IUlaAwPGKZ5x389E8iMBDNw9KjeTbl4V1BxVjwAUcwks/52ybSspgb28mPJZph + URyYLGUr1EXPq7HtsKEObBx62mFtqYnoz+afi//MPCMiKXTFQlTfYcZOQue3pLaqF1qJ + dM9A== +X-Received: by 10.180.160.212 with SMTP id xm20mr9723888wib.23.1381649969892; + Sun, 13 Oct 2013 00:39:29 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id i8sm21922217wiy.6.1969.12.31.16.00.00 + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sun, 13 Oct 2013 00:39:29 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v2] emacs: show: use interactive instead of current-prefix-arg +Date: Sun, 13 Oct 2013 08:39:12 +0100 +Message-Id: <1381649952-23122-1-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +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: Sun, 13 Oct 2013 07:39:39 -0000 + +Currently notmuch-show looks at the prefix-arg directly via +current-prefix-arg. This changes it to use the interactive +specification. + +One test (for elide-toggle functionality) set the prefix arg +directly. Update this test to set the new argument directly. +--- + +This is version 2 of the patches at +id:1381348886-5673-1-git-send-email-markwalters1009@gmail.com The +changes are in fixes in response to Austin's review +id:20131013033157.GE10539@mit.edu and his comments on irc. + +Specifically, this updates the doc string for elide-toggle in +notmuch-show and folds the test fix in (so the tests should always +pass) + +I can also confirm that C-u RET on an id:-button link does work as +expected (and as currently): opening the appropriate message with +inverted elide behaviour. + +Best wishes + +Mark + + + + emacs/notmuch-show.el | 12 +++++++----- + emacs/notmuch.el | 5 +++-- + test/emacs-show | 3 +-- + 3 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 5d7e24b..3189dda 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1080,15 +1080,17 @@ buttons for a corresponding notmuch search." + (make-text-button (first link) (second link) + :type 'notmuch-button-type + 'action `(lambda (arg) +- (notmuch-show ,(third link))) ++ (notmuch-show ,(third link) current-prefix-arg)) + 'follow-link t + 'help-echo "Mouse-1, RET: search for this message" + 'face goto-address-mail-face))))) + + ;;;###autoload +-(defun notmuch-show (thread-id &optional parent-buffer query-context buffer-name) ++(defun notmuch-show (thread-id &optional elide-toggle parent-buffer query-context buffer-name) + "Run \"notmuch show\" with the given thread ID and display results. + ++ELIDE-TOGGLE, if non-nil, inverts the default elide behavior. ++ + The optional PARENT-BUFFER is the notmuch-search buffer from + which this notmuch-show command was executed, (so that the + next thread from that buffer can be show when done with this +@@ -1102,7 +1104,7 @@ The optional BUFFER-NAME provides the name of the buffer in + which the message thread is shown. If it is nil (which occurs + when the command is called interactively) the argument to the + function is used." +- (interactive "sNotmuch show: ") ++ (interactive "sNotmuch show: \nP") + (let ((buffer-name (generate-new-buffer-name + (or buffer-name + (concat "*notmuch-" thread-id "*"))))) +@@ -1112,9 +1114,9 @@ function is used." + (setq notmuch-show-process-crypto notmuch-crypto-process-mime) + ;; Set the default value for + ;; `notmuch-show-elide-non-matching-messages' in this buffer. If +- ;; there is a prefix argument, invert the default. ++ ;; elide-toggle is set, invert the default. + (setq notmuch-show-elide-non-matching-messages notmuch-show-only-matching-messages) +- (if current-prefix-arg ++ (if elide-toggle + (setq notmuch-show-elide-non-matching-messages (not notmuch-show-elide-non-matching-messages))) + + (setq notmuch-show-thread-id thread-id +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 0ff248b..7124d0a 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -486,13 +486,14 @@ If BARE is set then do not prefix with \"thread:\"" + "Return a list of authors for the current region" + (notmuch-search-properties-in-region :subject beg end)) + +-(defun notmuch-search-show-thread () ++(defun notmuch-search-show-thread (&optional elide-toggle) + "Display the currently selected thread." +- (interactive) ++ (interactive "P") + (let ((thread-id (notmuch-search-find-thread-id)) + (subject (notmuch-search-find-subject))) + (if (> (length thread-id) 0) + (notmuch-show thread-id ++ elide-toggle + (current-buffer) + notmuch-search-query-string + ;; Name the buffer based on the subject. +diff --git a/test/emacs-show b/test/emacs-show +index ae70053..fb23db4 100755 +--- a/test/emacs-show ++++ b/test/emacs-show +@@ -91,8 +91,7 @@ test_begin_subtest "notmuch-show: elide non-matching messages (w/ prefix arg to + test_emacs '(let ((notmuch-show-only-matching-messages nil)) + (notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"") + (notmuch-test-wait) +- (let ((current-prefix-arg t)) +- (notmuch-search-show-thread)) ++ (notmuch-search-show-thread t) + (notmuch-test-wait) + (test-visible-output))' + test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on +-- +1.7.9.1 + -- 2.26.2