unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH v2 04/13] emacs: make "+" and "-" tagging operations in notmuch-show more robust
Date: Mon, 30 Jan 2012 06:26:13 +0400	[thread overview]
Message-ID: <1327890382-548-5-git-send-email-dmitry.kurochkin@gmail.com> (raw)
In-Reply-To: <1327890382-548-1-git-send-email-dmitry.kurochkin@gmail.com>

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 |   64 +++++++++++++++++-------------------------------
 1 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 84ac624..11dab2d 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -38,8 +38,9 @@
 
 (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-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.
@@ -1267,7 +1268,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.
@@ -1470,51 +1471,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."
@@ -1559,7 +1541,7 @@ argument, hide all of the messages."
 (defun notmuch-show-archive-thread-internal (show-next)
   ;; Remove the tag from the current set of messages.
   (goto-char (point-min))
-  (loop do (notmuch-show-remove-tag "inbox")
+  (loop do (notmuch-show-tag-message "-inbox")
 	until (not (notmuch-show-goto-message-next)))
   ;; Move to the next item in the search results, if any.
   (let ((parent-buffer notmuch-show-parent-buffer))
-- 
1.7.8.3

  parent reply	other threads:[~2012-01-30  2:27 UTC|newest]

Thread overview: 136+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-28  4:41 [PATCH 1/6] emacs: move tag format validation to `notmuch-tag' function Dmitry Kurochkin
2012-01-28  4:41 ` [PATCH 2/6] emacs: remove text properties from `notmuch-search-get-tags' result Dmitry Kurochkin
2012-01-28  4:41 ` [PATCH 3/6] emacs: make "+" and "-" tagging operations more robust Dmitry Kurochkin
2012-01-28 16:49   ` Jeremy Nickurak
2012-01-28 17:17     ` Dmitry Kurochkin
2012-01-29 22:57   ` Austin Clements
2012-01-30  1:32     ` Dmitry Kurochkin
2012-01-28  4:41 ` [PATCH 4/6] test: fix emacs tests after tagging operations changes Dmitry Kurochkin
2012-01-29 22:58   ` Austin Clements
2012-01-29 23:09     ` Dmitry Kurochkin
2012-01-28  4:41 ` [PATCH 5/6] emacs: add "*" binding for notmuch-show view Dmitry Kurochkin
2012-01-28  4:41 ` [PATCH 6/6] emacs: separate history for operations which accept single and multiple tags Dmitry Kurochkin
2012-01-29 23:02   ` Austin Clements
2012-01-30  1:42     ` Dmitry Kurochkin
2012-01-28  5:05 ` [PATCH 7/6] emacs: relax tag syntax check in `notmuch-tag' function Dmitry Kurochkin
2012-01-28  8:56   ` Jani Nikula
2012-01-28  9:49     ` Dmitry Kurochkin
2012-02-19 20:53     ` Pieter Praet
2012-01-28  5:59 ` [PATCH 8/6] emacs: use message ids instead of thread id in `notmuch-show-operate-all' Dmitry Kurochkin
2012-01-28  5:59   ` [PATCH 9/6] emacs: code cleanup in `notmuch-show-operate-all', no functional changes Dmitry Kurochkin
2012-01-28  9:09   ` [PATCH 8/6] emacs: use message ids instead of thread id in `notmuch-show-operate-all' Jani Nikula
2012-01-28  9:42     ` Dmitry Kurochkin
2012-01-29 23:11   ` Austin Clements
2012-01-30  1:50     ` Dmitry Kurochkin
2012-01-29 21:34 ` [PATCH 1/6] emacs: move tag format validation to `notmuch-tag' function Austin Clements
2012-01-29 22:54   ` Dmitry Kurochkin
2012-01-29 23:16     ` Austin Clements
2012-01-29 23:32       ` Dmitry Kurochkin
2012-01-30  2:26 ` [PATCH v2 00/13] emacs: more robust and consistent tagging operations Dmitry Kurochkin
2012-01-30  2:26   ` [PATCH v2 01/13] emacs: move tag format validation to `notmuch-tag' function Dmitry Kurochkin
2012-01-30  2:26   ` [PATCH v2 02/13] emacs: remove text properties from `notmuch-search-get-tags' result Dmitry Kurochkin
2012-01-30  2:26   ` [PATCH v2 03/13] emacs: make "+" and "-" tagging operations in notmuch-search more robust Dmitry Kurochkin
2012-01-30  4:48     ` Austin Clements
2012-01-30  5:10       ` Dmitry Kurochkin
2012-01-30  2:26   ` Dmitry Kurochkin [this message]
2012-01-30  2:26   ` [PATCH v2 05/13] test: fix emacs tests after tagging operations changes Dmitry Kurochkin
2012-01-30  2:26   ` [PATCH v2 06/13] emacs: rename `notmuch-search-operate-all' to `notmuch-search-tag-all' Dmitry Kurochkin
2012-01-30  2:26   ` [PATCH v2 07/13] emacs: add "*" binding for notmuch-show view Dmitry Kurochkin
2012-01-30  2:26   ` [PATCH v2 08/13] emacs: separate history for operations which accept single and multiple tags Dmitry Kurochkin
2012-01-30  2:26   ` [PATCH v2 09/13] emacs: relax tag syntax check in `notmuch-tag' function Dmitry Kurochkin
2012-01-30  2:26   ` [PATCH v2 10/13] emacs: use message ids instead of thread id in `notmuch-show-operate-all' Dmitry Kurochkin
2012-01-30  4:57     ` Austin Clements
2012-01-30  5:21       ` Dmitry Kurochkin
2012-01-30  2:26   ` [PATCH v2 11/13] emacs: code cleanup in `notmuch-show-operate-all', no functional changes Dmitry Kurochkin
2012-01-30  4:59     ` Austin Clements
2012-01-30  5:25       ` Dmitry Kurochkin
2012-01-30  2:26   ` [PATCH v2 12/13] emacs: accept empty tag list in `notmuch-tag' Dmitry Kurochkin
2012-01-30  2:26   ` [PATCH v2 13/13] NEWS: document Emacs UI tagging operations changes Dmitry Kurochkin
2012-01-30  5:04     ` Austin Clements
2012-01-30  5:16       ` Dmitry Kurochkin
2012-01-30  5:33 ` emacs: more flexible and consistent tagging operations Dmitry Kurochkin
2012-01-30  5:33   ` [PATCH v3 01/12] emacs: move tag format validation to `notmuch-tag' function Dmitry Kurochkin
2012-01-30  5:33   ` [PATCH v3 02/12] emacs: remove text properties from `notmuch-search-get-tags' result Dmitry Kurochkin
2012-01-30  5:33   ` [PATCH v3 03/12] emacs: make "+" and "-" tagging operations in notmuch-search more flexible Dmitry Kurochkin
2012-01-30  5:33   ` [PATCH v3 04/12] emacs: make "+" and "-" tagging operations in notmuch-show " Dmitry Kurochkin
2012-01-30  5:33   ` [PATCH v3 05/12] test: fix emacs tests after tagging operations changes Dmitry Kurochkin
2012-01-30  5:33   ` [PATCH v3 06/12] emacs: rename `notmuch-search-operate-all' to `notmuch-search-tag-all' Dmitry Kurochkin
2012-01-30  5:33   ` [PATCH v3 07/12] emacs: add "*" binding for notmuch-show view Dmitry Kurochkin
2012-01-30  5:34   ` [PATCH v3 08/12] emacs: separate history for operations which accept single and multiple tags Dmitry Kurochkin
2012-01-30  5:34   ` [PATCH v3 09/12] emacs: relax tag syntax check in `notmuch-tag' function Dmitry Kurochkin
2012-01-30  5:34   ` [PATCH v3 10/12] emacs: accept empty tag list in `notmuch-tag' Dmitry Kurochkin
2012-01-30  5:34   ` [PATCH v3 11/12] emacs: s/tags/tag-changes/ for arguments of tagging functions Dmitry Kurochkin
2012-01-30  5:34   ` [PATCH v3 12/12] NEWS: document Emacs UI tagging operations changes Dmitry Kurochkin
2012-01-30 15:20   ` emacs: more flexible and consistent tagging operations Austin Clements
2012-01-30 15:55   ` Tomi Ollila
2012-01-31  4:54   ` [PATCH v4 00/12] " Dmitry Kurochkin
2012-01-31  4:54     ` [PATCH v4 01/12] emacs: move tag format validation to `notmuch-tag' function Dmitry Kurochkin
2012-01-31  4:54     ` [PATCH v4 02/12] emacs: remove text properties from `notmuch-search-get-tags' result Dmitry Kurochkin
2012-02-04  1:49       ` David Bremner
2012-01-31  4:54     ` [PATCH v4 03/12] emacs: make "+" and "-" tagging operations in notmuch-search more flexible Dmitry Kurochkin
2012-01-31  4:54     ` [PATCH v4 04/12] emacs: make "+" and "-" tagging operations in notmuch-show " Dmitry Kurochkin
2012-01-31  4:54     ` [PATCH v4 05/12] test: fix emacs tests after tagging operations changes Dmitry Kurochkin
2012-01-31  4:54     ` [PATCH v4 06/12] emacs: rename `notmuch-search-operate-all' to `notmuch-search-tag-all' Dmitry Kurochkin
2012-01-31  4:54     ` [PATCH v4 07/12] emacs: add "*" binding for notmuch-show view Dmitry Kurochkin
2012-01-31  4:54     ` [PATCH v4 08/12] emacs: separate history for operations which accept single and multiple tags Dmitry Kurochkin
2012-01-31  4:54     ` [PATCH v4 09/12] emacs: relax tag syntax check in `notmuch-tag' function Dmitry Kurochkin
2012-01-31  4:54     ` [PATCH v4 10/12] emacs: accept empty tag list in `notmuch-tag' Dmitry Kurochkin
2012-01-31  4:54     ` [PATCH v4 11/12] emacs: s/tags/tag-changes/ for arguments of tagging functions Dmitry Kurochkin
2012-01-31  4:54     ` [PATCH v4 12/12] NEWS: document Emacs UI tagging operations changes Dmitry Kurochkin
2012-02-05  7:13 ` [PATCH v5 00/12] emacs: more flexible and consistent tagging operations Dmitry Kurochkin
2012-02-05  7:13   ` [PATCH v5 01/12] emacs: move tag format validation to `notmuch-tag' function Dmitry Kurochkin
2012-02-05  7:13   ` [PATCH v5 02/12] emacs: remove text properties from `notmuch-search-get-tags' result Dmitry Kurochkin
2012-02-05  7:13   ` [PATCH v5 03/12] emacs: make "+" and "-" tagging operations in notmuch-search more flexible Dmitry Kurochkin
2012-02-05  7:13   ` [PATCH v5 04/12] emacs: make "+" and "-" tagging operations in notmuch-show " Dmitry Kurochkin
2012-02-05  7:13   ` [PATCH v5 05/12] test: fix emacs tests after tagging operations changes Dmitry Kurochkin
2012-02-05  7:13   ` [PATCH v5 06/12] emacs: rename `notmuch-search-operate-all' to `notmuch-search-tag-all' Dmitry Kurochkin
2012-02-05  7:13   ` [PATCH v5 07/12] emacs: add "*" binding for notmuch-show view Dmitry Kurochkin
2012-02-05  7:13   ` [PATCH v5 08/12] emacs: separate history for operations which accept single and multiple tags Dmitry Kurochkin
2012-02-05  7:13   ` [PATCH v5 09/12] emacs: relax tag syntax check in `notmuch-tag' function Dmitry Kurochkin
2012-02-05  7:13   ` [PATCH v5 10/12] emacs: accept empty tag list in `notmuch-tag' Dmitry Kurochkin
2012-02-05  7:13   ` [PATCH v5 11/12] emacs: s/tags/tag-changes/ for arguments of tagging functions Dmitry Kurochkin
2012-02-05  7:13   ` [PATCH v5 12/12] NEWS: document Emacs UI tagging operations changes Dmitry Kurochkin
2012-02-08 15:58   ` [PATCH v5 00/12] emacs: more flexible and consistent tagging operations David Bremner
2012-02-23 23:07     ` Pieter Praet
2012-02-23 23:09       ` [PATCH 1/6] test: emacs: new tests "notmuch-show: {add, remove} multiple tags {to, from} single message" Pieter Praet
2012-02-24 10:35         ` Dmitry Kurochkin
2012-02-24 22:33           ` Pieter Praet
2012-02-23 23:09       ` [PATCH 2/6] test: emacs: new test "notmuch-show: change tags of all messages in current buffer" Pieter Praet
2012-02-23 23:09       ` [PATCH 3/6] test: emacs: `notmuch-show-tag-all' sans prefix arg should only tag open messages Pieter Praet
2012-02-23 23:09       ` [PATCH 4/6] emacs: add predicate arg to `notmuch-show-mapc' Pieter Praet
2012-02-24 10:39         ` Dmitry Kurochkin
2012-02-24 22:35           ` Pieter Praet
2012-02-23 23:09       ` [PATCH 5/6] emacs: simplify `notmuch-show-get-messages-ids{, -search}' Pieter Praet
2012-02-24 10:42         ` Dmitry Kurochkin
2012-02-24 22:36           ` Pieter Praet
2012-02-23 23:09       ` [PATCH 6/6] emacs: `notmuch-show-tag-all' sans prefix arg only tags open messages Pieter Praet
2012-02-24 10:47         ` Dmitry Kurochkin
2012-02-24 22:37           ` Pieter Praet
2012-02-24 10:30       ` [PATCH v5 00/12] emacs: more flexible and consistent tagging operations Dmitry Kurochkin
2012-02-24 10:33         ` Dmitry Kurochkin
2012-02-24 17:39           ` Jani Nikula
2012-02-24 22:40           ` Pieter Praet
2012-02-24 22:38         ` Pieter Praet
2012-02-25  0:05           ` Pieter Praet
2012-02-25 16:20       ` David Bremner
2012-02-27 14:50         ` Tomi Ollila
2012-02-28 19:34           ` Pieter Praet
2012-02-24 22:30     ` [PATCH v2 0/6] `notmuch-show-tag-all' with prefix arg only tags open messages Pieter Praet
2012-02-24 22:30       ` [PATCH v2 1/6] test: emacs: new tests "notmuch-show: {add, remove} multiple tags {to, from} single message" Pieter Praet
2012-03-21  1:06         ` Mark Walters
2012-12-10  2:48         ` David Bremner
2012-12-11 14:04         ` David Bremner
2012-02-24 22:30       ` [PATCH v2 2/6] test: emacs: new test "notmuch-show: change tags of all messages in current buffer" Pieter Praet
2012-10-16  2:15         ` Ethan Glasser-Camp
2012-02-24 22:30       ` [PATCH v2 3/6] test: emacs: `notmuch-show-tag-all' with prefix arg should only tag open messages Pieter Praet
2013-02-19  0:27         ` David Bremner
2012-02-24 22:30       ` [PATCH v2 4/6] emacs: add optional predicate arg to `notmuch-show-mapc' Pieter Praet
2012-03-21  1:33         ` Mark Walters
2012-10-16  2:59           ` Ethan Glasser-Camp
2012-10-16  2:18         ` Ethan Glasser-Camp
2012-02-24 22:30       ` [PATCH v2 5/6] emacs: simplify `notmuch-show-get-messages-ids{, -search}' Pieter Praet
2012-03-21  1:36         ` Mark Walters
2012-10-16  3:12           ` Ethan Glasser-Camp
2012-03-21  1:40         ` Mark Walters
2012-02-24 22:30       ` [PATCH v2 6/6] emacs: `notmuch-show-tag-all' with prefix arg only tags open messages Pieter Praet
2012-10-16  3:39         ` Ethan Glasser-Camp

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1327890382-548-5-git-send-email-dmitry.kurochkin@gmail.com \
    --to=dmitry.kurochkin@gmail.com \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).