From: Dmitry Kurochkin Date: Tue, 31 Jan 2012 04:54:18 +0000 (+0400) Subject: [PATCH v4 04/12] emacs: make "+" and "-" tagging operations in notmuch-show more... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c73200abd1069c9cdad87d52012393b8add5da1b;p=notmuch-archives.git [PATCH v4 04/12] emacs: make "+" and "-" tagging operations in notmuch-show more flexible --- diff --git a/0d/319ce4553a931744f9f231fc85be25cf5077a0 b/0d/319ce4553a931744f9f231fc85be25cf5077a0 new file mode 100644 index 000000000..d71a6fec9 --- /dev/null +++ b/0d/319ce4553a931744f9f231fc85be25cf5077a0 @@ -0,0 +1,195 @@ +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 530DE429E34 + for ; Mon, 30 Jan 2012 20:55:56 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, 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 zeWiRqy+eLJz for ; + Mon, 30 Jan 2012 20:55:53 -0800 (PST) +Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com + [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 1C024418C3A + for ; Mon, 30 Jan 2012 20:55:52 -0800 (PST) +Received: by mail-bk0-f53.google.com with SMTP id 11so2152468bke.26 + for ; Mon, 30 Jan 2012 20:55:52 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; + h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; + bh=8N5/6y8qa0ZClN+eH2C5yfde9rDa36yQYwfZU+l6M0k=; + b=J2VKWKNpxjQGxu6u4VUBvhtWDLw+usDkOHP583mF74Sh6dcaUUcOMkaJRY81H2Yau1 + 84JdlA1eJGNAyBRddHVJJ2tjBa9NxD3pre9YX+Cb5c4l5a5HYRl7PbQUdxl46jyE3CxR + eRWfSGG5q9gasf6UrOX9RMbUKDyUcV0DmDh80= +Received: by 10.204.10.86 with SMTP id o22mr1285108bko.111.1327985752733; + Mon, 30 Jan 2012 20:55:52 -0800 (PST) +Received: from localhost ([91.144.186.21]) + by mx.google.com with ESMTPS id ev5sm42534157bkb.4.2012.01.30.20.55.51 + (version=TLSv1/SSLv3 cipher=OTHER); + Mon, 30 Jan 2012 20:55:52 -0800 (PST) +From: Dmitry Kurochkin +To: notmuch@notmuchmail.org +Subject: [PATCH v4 04/12] emacs: make "+" and "-" tagging operations in + notmuch-show more flexible +Date: Tue, 31 Jan 2012 08:54:18 +0400 +Message-Id: <1327985666-29191-5-git-send-email-dmitry.kurochkin@gmail.com> +X-Mailer: git-send-email 1.7.9 +In-Reply-To: <1327985666-29191-1-git-send-email-dmitry.kurochkin@gmail.com> +References: <1327901644-15799-1-git-send-email-dmitry.kurochkin@gmail.com> + <1327985666-29191-1-git-send-email-dmitry.kurochkin@gmail.com> +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: Tue, 31 Jan 2012 04:55:56 -0000 + +Before the change, "+" and "-" tagging operations in notmuch-show view +accepted only a single tag. The patch makes them use the recently +added `notmuch-read-tag-changes' function, which allows to enter +multiple tags with "+" and "-" prefixes. So after the change, "+" and +"-" bindings in notmuch-show view allow to both add and remove +multiple tags. The only difference between "+" and "-" is the +minibuffer initial input ("+" and "-" respectively). +--- + emacs/notmuch-show.el | 73 +++++++++++++++++------------------------------- + 1 files changed, 26 insertions(+), 47 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index de9421e..a0efae7 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -38,9 +38,10 @@ + + (declare-function notmuch-call-notmuch-process "notmuch" (&rest args)) + (declare-function notmuch-fontify-headers "notmuch" nil) +-(declare-function notmuch-select-tag-with-completion "notmuch" (prompt &rest search-terms)) ++(declare-function notmuch-read-tag-changes "notmuch" (&optional initial-input &rest search-terms)) + (declare-function notmuch-search-next-thread "notmuch" nil) + (declare-function notmuch-search-show-thread "notmuch" nil) ++(declare-function notmuch-update-tags "notmuch" (current-tags tag-changes)) + + (defcustom notmuch-message-headers '("Subject" "To" "Cc" "Date") + "Headers that should be shown in a message, in this order. +@@ -1269,7 +1270,7 @@ Some useful entries are: + + (defun notmuch-show-mark-read () + "Mark the current message as read." +- (notmuch-show-remove-tag "unread")) ++ (notmuch-show-tag-message "-unread")) + + ;; Functions for getting attributes of several messages in the current + ;; thread. +@@ -1483,51 +1484,32 @@ than only the current message." + (message (format "Command '%s' exited abnormally with code %d" + shell-command exit-code)))))))) + +-(defun notmuch-show-add-tags-worker (current-tags add-tags) +- "Add to `current-tags' with any tags from `add-tags' not +-currently present and return the result." +- (let ((result-tags (copy-sequence current-tags))) +- (mapc (lambda (add-tag) +- (unless (member add-tag current-tags) +- (setq result-tags (push add-tag result-tags)))) +- add-tags) +- (sort result-tags 'string<))) +- +-(defun notmuch-show-del-tags-worker (current-tags del-tags) +- "Remove any tags in `del-tags' from `current-tags' and return +-the result." +- (let ((result-tags (copy-sequence current-tags))) +- (mapc (lambda (del-tag) +- (setq result-tags (delete del-tag result-tags))) +- del-tags) +- result-tags)) +- +-(defun notmuch-show-add-tag (&rest toadd) +- "Add a tag to the current message." +- (interactive +- (list (notmuch-select-tag-with-completion "Tag to add: "))) ++(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-show-add-tags-worker current-tags toadd))) +- ++ (new-tags (notmuch-update-tags current-tags tag-changes))) + (unless (equal current-tags new-tags) +- (apply 'notmuch-tag (notmuch-show-get-message-id) +- (mapcar (lambda (s) (concat "+" s)) toadd)) ++ (apply 'notmuch-tag (notmuch-show-get-message-id) tag-changes) + (notmuch-show-set-tags new-tags)))) + +-(defun notmuch-show-remove-tag (&rest toremove) +- "Remove a tag from the current message." +- (interactive +- (list (notmuch-select-tag-with-completion +- "Tag to remove: " (notmuch-show-get-message-id)))) ++(defun notmuch-show-tag (&optional initial-input) ++ "Change tags for the current message, read input from the minibuffer." ++ (interactive) ++ (let ((tag-changes (notmuch-read-tag-changes ++ initial-input (notmuch-show-get-message-id)))) ++ (apply 'notmuch-show-tag-message tag-changes))) + +- (let* ((current-tags (notmuch-show-get-tags)) +- (new-tags (notmuch-show-del-tags-worker current-tags toremove))) ++(defun notmuch-show-add-tag () ++ "Same as `notmuch-show-tag' but sets initial input to '+'." ++ (interactive) ++ (notmuch-show-tag "+")) + +- (unless (equal current-tags new-tags) +- (apply 'notmuch-tag (notmuch-show-get-message-id) +- (mapcar (lambda (s) (concat "-" s)) toremove)) +- (notmuch-show-set-tags new-tags)))) ++(defun notmuch-show-remove-tag () ++ "Same as `notmuch-show-tag' but sets initial input to '-'." ++ (interactive) ++ (notmuch-show-tag "-")) + + (defun notmuch-show-toggle-headers () + "Toggle the visibility of the current message headers." +@@ -1575,10 +1557,8 @@ argument, hide all of the messages." + If the remove switch is given, tags will be removed instead of + added." + (goto-char (point-min)) +- (let ((tag-function (if remove +- 'notmuch-show-remove-tag +- 'notmuch-show-add-tag))) +- (loop do (funcall tag-function tag) ++ (let ((op (if remove "-" "+"))) ++ (loop do (notmuch-show-tag-message (concat op tag)) + until (not (notmuch-show-goto-message-next))))) + + (defun notmuch-show-add-tag-thread (tag) +@@ -1641,9 +1621,8 @@ If a prefix argument is given, the message will be + \"unarchived\" (ie. the \"inbox\" tag will be added instead of + removed)." + (interactive "P") +- (if unarchive +- (notmuch-show-add-tag "inbox") +- (notmuch-show-remove-tag "inbox"))) ++ (let ((op (if unarchive "+" "-"))) ++ (notmuch-show-tag-message (concat op "inbox")))) + + (defun notmuch-show-archive-message-then-next () + "Archive the current message, then show the next open message in the current thread." +-- +1.7.9 +