[PATCH 1/2] emacs: show: use interactive instead of current-prefix-arg

diff --git a/03/f17eb0a30cd6e21fc78c9240f060c9405b5925 b/03/f17eb0a30cd6e21fc78c9240f060c9405b5925
new file mode 100644 (file)
index 0000000..72c6649
--- /dev/null
+++ b/03/f17eb0a30cd6e21fc78c9240f060c9405b5925
@@ -0,0 +1,141 @@
+Return-Path: <markwalters1009@gmail.com>\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 854DF431FC4\r
+       for <notmuch@notmuchmail.org>; Wed,  9 Oct 2013 13:01:42 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       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 Fn8C9v9jJtD1 for <notmuch@notmuchmail.org>;\r
+       Wed,  9 Oct 2013 13:01:36 -0700 (PDT)\r
+Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com\r
+       [209.85.212.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id AFE39431FAE\r
+       for <notmuch@notmuchmail.org>; Wed,  9 Oct 2013 13:01:35 -0700 (PDT)\r
+Received: by mail-wi0-f169.google.com with SMTP id cb5so1223185wib.4\r
+       for <notmuch@notmuchmail.org>; Wed, 09 Oct 2013 13:01:33 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+       bh=29xBVgZO5h8kdtTeJ1+Y5RqqWEv0MkX+r+ghEW1ixGg=;\r
+       b=oZMRkDNDFQZ2sag+LrJGn4wDM7mm6CrAmV8FsoehBcfdc8AFmoqZLkmJBubj/zadmM\r
+       nLOXMadLcwlc0aIi8n51eA0+mTCgjfqKsmfvADNWIMvjEgOMKKxto9jdeEZs+9MVOiyK\r
+       mUK57jeFciOE/ZG90XYZR2Po6irHJn5iYRqwEJCKtxLpK4ouwebWpZguUlS6yGeXPU0I\r
+       CN5huRG7N1a4rYeDLtXubCBZ1oi7f2JA5n2zExD4bXnjdO7jXyKuPpyW9DJTrnlkr9Pm\r
+       1bjnTiSWBSjQB5WwBXU7Qoo0ntup44vidvo7xFRq0UrHj8fRCF1O+nCv2Lwxpd2/R4XC\r
+       9i3Q==\r
+X-Received: by 10.194.75.165 with SMTP id d5mr8408684wjw.18.1381348893343;\r
+       Wed, 09 Oct 2013 13:01:33 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id\r
+       sh5sm18481451wic.11.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Wed, 09 Oct 2013 13:01:33 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] emacs: show: use interactive instead of\r
+ current-prefix-arg\r
+Date: Wed,  9 Oct 2013 21:01:25 +0100\r
+Message-Id: <1381348886-5673-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1381348886-5673-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1381348886-5673-1-git-send-email-markwalters1009@gmail.com>\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, 09 Oct 2013 20:01:43 -0000\r
+\r
+Currently notmuch-show looks at the prefix-arg directly via\r
+current-prefix-arg. This changes it to use the interactive\r
+specification.\r
+---\r
+ emacs/notmuch-show.el |   12 +++++++-----\r
+ emacs/notmuch.el      |    5 +++--\r
+ 2 files changed, 10 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 5d7e24b..15f9ce6 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1080,15 +1080,17 @@ buttons for a corresponding notmuch search."\r
+       (make-text-button (first link) (second link)\r
+                         :type 'notmuch-button-type\r
+                         'action `(lambda (arg)\r
+-                                   (notmuch-show ,(third link)))\r
++                                   (notmuch-show ,(third link) current-prefix-arg))\r
+                         'follow-link t\r
+                         'help-echo "Mouse-1, RET: search for this message"\r
+                         'face goto-address-mail-face)))))\r
+ \r
+ ;;;###autoload\r
+-(defun notmuch-show (thread-id &optional parent-buffer query-context buffer-name)\r
++(defun notmuch-show (thread-id &optional elide-toggle parent-buffer query-context buffer-name)\r
+   "Run \"notmuch show\" with the given thread ID and display results.\r
+ \r
++The optional ELIDE-TOGGLE inverts the default elide behaviour.\r
++\r
+ The optional PARENT-BUFFER is the notmuch-search buffer from\r
+ which this notmuch-show command was executed, (so that the\r
+ next thread from that buffer can be show when done with this\r
+@@ -1102,7 +1104,7 @@ The optional BUFFER-NAME provides the name of the buffer in\r
+ which the message thread is shown. If it is nil (which occurs\r
+ when the command is called interactively) the argument to the\r
+ function is used."\r
+-  (interactive "sNotmuch show: ")\r
++  (interactive "sNotmuch show: \nP")\r
+   (let ((buffer-name (generate-new-buffer-name\r
+                     (or buffer-name\r
+                         (concat "*notmuch-" thread-id "*")))))\r
+@@ -1112,9 +1114,9 @@ function is used."\r
+     (setq notmuch-show-process-crypto notmuch-crypto-process-mime)\r
+     ;; Set the default value for\r
+     ;; `notmuch-show-elide-non-matching-messages' in this buffer. If\r
+-    ;; there is a prefix argument, invert the default.\r
++    ;; elide-toggle is set, invert the default.\r
+     (setq notmuch-show-elide-non-matching-messages notmuch-show-only-matching-messages)\r
+-    (if current-prefix-arg\r
++    (if elide-toggle\r
+       (setq notmuch-show-elide-non-matching-messages (not notmuch-show-elide-non-matching-messages)))\r
+ \r
+     (setq notmuch-show-thread-id thread-id\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 0ff248b..7124d0a 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -486,13 +486,14 @@ If BARE is set then do not prefix with \"thread:\""\r
+   "Return a list of authors for the current region"\r
+   (notmuch-search-properties-in-region :subject beg end))\r
+ \r
+-(defun notmuch-search-show-thread ()\r
++(defun notmuch-search-show-thread (&optional elide-toggle)\r
+   "Display the currently selected thread."\r
+-  (interactive)\r
++  (interactive "P")\r
+   (let ((thread-id (notmuch-search-find-thread-id))\r
+       (subject (notmuch-search-find-subject)))\r
+     (if (> (length thread-id) 0)\r
+       (notmuch-show thread-id\r
++                    elide-toggle\r
+                     (current-buffer)\r
+                     notmuch-search-query-string\r
+                     ;; Name the buffer based on the subject.\r
+-- \r
+1.7.9.1\r
+\r