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