[PATCH 8/8] emacs: eliminate show-tag-message in favor of just show-tag

diff --git a/23/dd2ea59114563820ac3e3e5ff0c3343bbc6c36 b/23/dd2ea59114563820ac3e3e5ff0c3343bbc6c36
new file mode 100644 (file)
index 0000000..31da155
--- /dev/null
+++ b/23/dd2ea59114563820ac3e3e5ff0c3343bbc6c36
@@ -0,0 +1,109 @@
+Return-Path: <jrollins@finestructure.net>\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 C128F431FD9\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Apr 2012 17:35:49 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 i8OTPbXyoC7x for <notmuch@notmuchmail.org>;\r
+       Sat,  7 Apr 2012 17:35:47 -0700 (PDT)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id B3FA3431FB6\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Apr 2012 17:35:47 -0700 (PDT)\r
+Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by earth-doxen-postvirus (Postfix) with ESMTP id 8BAF266E0108\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Apr 2012 17:35:46 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new\r
+Received: from finestructure.net (unknown [76.89.193.65])\r
+       (Authenticated sender: jrollins)\r
+       by earth-doxen-submit (Postfix) with ESMTP id BFE9E66E00E2\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Apr 2012 17:35:44 -0700 (PDT)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+       id 1073D969; Sat,  7 Apr 2012 17:35:43 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH 8/8] emacs: eliminate show-tag-message in favor of just\r
+       show-tag\r
+Date: Sat,  7 Apr 2012 17:35:38 -0700\r
+Message-Id: <1333845338-22960-9-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1333845338-22960-8-git-send-email-jrollins@finestructure.net>\r
+References: <1333354853-25729-1-git-send-email-jrollins@finestructure.net>\r
+       <1333845338-22960-1-git-send-email-jrollins@finestructure.net>\r
+       <1333845338-22960-2-git-send-email-jrollins@finestructure.net>\r
+       <1333845338-22960-3-git-send-email-jrollins@finestructure.net>\r
+       <1333845338-22960-4-git-send-email-jrollins@finestructure.net>\r
+       <1333845338-22960-5-git-send-email-jrollins@finestructure.net>\r
+       <1333845338-22960-6-git-send-email-jrollins@finestructure.net>\r
+       <1333845338-22960-7-git-send-email-jrollins@finestructure.net>\r
+       <1333845338-22960-8-git-send-email-jrollins@finestructure.net>\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: Sun, 08 Apr 2012 00:35:50 -0000\r
+\r
+notmuch-show-tag-message is now completely redundant with\r
+notmuch-show-tag so we eliminate it to simplify the interface.\r
+---\r
+ emacs/notmuch-show.el |   14 ++------------\r
+ 1 files changed, 2 insertions(+), 12 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 69bca02..f174910 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1396,7 +1396,7 @@ current thread."\r
+ \r
+ (defun notmuch-show-mark-read ()\r
+   "Mark the current message as read."\r
+-  (notmuch-show-tag-message "-unread"))\r
++  (notmuch-show-tag "-unread"))\r
+ \r
+ ;; Functions for getting attributes of several messages in the current\r
+ ;; thread.\r
+@@ -1634,16 +1634,6 @@ than only the current message."\r
+           (message (format "Command '%s' exited abnormally with code %d"\r
+                            shell-command exit-code))))))))\r
+ \r
+-(defun notmuch-show-tag-message (&rest tag-changes)\r
+-  "Change tags for the current message.\r
+-\r
+-TAG-CHANGES is a list of tag operations for `notmuch-tag'."\r
+-  (let* ((current-tags (notmuch-show-get-tags))\r
+-       (new-tags (notmuch-update-tags current-tags tag-changes)))\r
+-    (unless (equal current-tags new-tags)\r
+-      (funcall 'notmuch-tag (notmuch-show-get-message-id) tag-changes)\r
+-      (notmuch-show-set-tags new-tags))))\r
+-\r
+ (defun notmuch-show-tag (&optional tag-changes)\r
+   "Change tags for the current message.\r
+ \r
+@@ -1768,7 +1758,7 @@ If a prefix argument is given, the message will be\r
+ removed)."\r
+   (interactive "P")\r
+   (let ((op (if unarchive "+" "-")))\r
+-    (notmuch-show-tag-message (concat op "inbox"))))\r
++    (notmuch-show-tag (concat op "inbox"))))\r
+ \r
+ (defun notmuch-show-archive-message-then-next-or-exit ()\r
+   "Archive the current message, then show the next open message in the current thread.\r
+-- \r
+1.7.9.1\r
+\r