--- /dev/null
+Return-Path: <dmitry.kurochkin@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 30D0A431FBD\r
+ for <notmuch@notmuchmail.org>; Sat, 4 Feb 2012 23:15:30 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_FROM=0.001, 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 ORYLYw7nvViJ for <notmuch@notmuchmail.org>;\r
+ Sat, 4 Feb 2012 23:15:26 -0800 (PST)\r
+Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com\r
+ [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 1F3C7431FC4\r
+ for <notmuch@notmuchmail.org>; Sat, 4 Feb 2012 23:15:23 -0800 (PST)\r
+Received: by mail-bk0-f53.google.com with SMTP id 11so4650313bke.26\r
+ for <notmuch@notmuchmail.org>; Sat, 04 Feb 2012 23:15:23 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+ h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;\r
+ bh=0Y+c310SOKHDh3N0E6BLP8Tqwkx9EsrqesDsvfOv3KM=;\r
+ b=i4aMZKPmhsXpMsmJlH6HMnKLvu82ACiKOvx37Gvv61sI8Gn61zNDVf2UvadYwTiw98\r
+ 8IONJUPCsuVd3+qac4ODAPediQH4lsBni/O4dabBqdG8Xs8DwCGWJKb20a1LnN4jjwgj\r
+ MXUs2gaC36wEGDfzWonfaqsdjkYk4awyyVKbk=\r
+Received: by 10.204.152.206 with SMTP id h14mr6159220bkw.62.1328426123765;\r
+ Sat, 04 Feb 2012 23:15:23 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+ by mx.google.com with ESMTPS id x20sm33002962bka.9.2012.02.04.23.15.22\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Sat, 04 Feb 2012 23:15:22 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5 03/12] emacs: make "+" and "-" tagging operations in\r
+ notmuch-search more flexible\r
+Date: Sun, 5 Feb 2012 11:13:44 +0400\r
+Message-Id: <1328426033-21480-4-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-Mailer: git-send-email 1.7.9\r
+In-Reply-To: <1328426033-21480-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+ <1328426033-21480-1-git-send-email-dmitry.kurochkin@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: Sun, 05 Feb 2012 07:15:30 -0000\r
+\r
+Before the change, "+" and "-" tagging operations in notmuch-search\r
+view accepted only a single tag. The patch makes them use the\r
+recently added `notmuch-read-tag-changes' function (renamed\r
+`notmuch-select-tags-with-completion'), which allows to enter multiple\r
+tags with "+" and "-" prefixes. So after the change, "+" and "-"\r
+bindings in notmuch-search view allow to both add and remove multiple\r
+tags. The only difference between "+" and "-" is the minibuffer\r
+initial input ("+" and "-" respectively).\r
+---\r
+ emacs/notmuch.el | 163 +++++++++++++++++++++++++++---------------------------\r
+ 1 files changed, 81 insertions(+), 82 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 5980fea..1b472dd 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -76,38 +76,56 @@ For example:\r
+ (defvar notmuch-query-history nil\r
+ "Variable to store minibuffer history for notmuch queries")\r
+ \r
+-(defun notmuch-tag-completions (&optional prefixes search-terms)\r
+- (let ((tag-list\r
+- (split-string\r
+- (with-output-to-string\r
+- (with-current-buffer standard-output\r
+- (apply 'call-process notmuch-command nil t\r
+- nil "search-tags" search-terms)))\r
+- "\n+" t)))\r
+- (if (null prefixes)\r
+- tag-list\r
+- (apply #'append\r
+- (mapcar (lambda (tag)\r
+- (mapcar (lambda (prefix)\r
+- (concat prefix tag)) prefixes))\r
+- tag-list)))))\r
++(defun notmuch-tag-completions (&optional search-terms)\r
++ (split-string\r
++ (with-output-to-string\r
++ (with-current-buffer standard-output\r
++ (apply 'call-process notmuch-command nil t\r
++ nil "search-tags" search-terms)))\r
++ "\n+" t))\r
+ \r
+ (defun notmuch-select-tag-with-completion (prompt &rest search-terms)\r
+- (let ((tag-list (notmuch-tag-completions nil search-terms)))\r
++ (let ((tag-list (notmuch-tag-completions search-terms)))\r
+ (completing-read prompt tag-list)))\r
+ \r
+-(defun notmuch-select-tags-with-completion (prompt &optional prefixes &rest search-terms)\r
+- (let ((tag-list (notmuch-tag-completions prefixes search-terms))\r
+- (crm-separator " ")\r
+- ;; By default, space is bound to "complete word" function.\r
+- ;; Re-bind it to insert a space instead. Note that <tab>\r
+- ;; still does the completion.\r
+- (crm-local-completion-map\r
+- (let ((map (make-sparse-keymap)))\r
+- (set-keymap-parent map crm-local-completion-map)\r
+- (define-key map " " 'self-insert-command)\r
+- map)))\r
+- (delete "" (completing-read-multiple prompt tag-list))))\r
++(defun notmuch-read-tag-changes (&optional initial-input &rest search-terms)\r
++ (let* ((all-tag-list (notmuch-tag-completions))\r
++ (add-tag-list (mapcar (apply-partially 'concat "+") all-tag-list))\r
++ (remove-tag-list (mapcar (apply-partially 'concat "-")\r
++ (if (null search-terms)\r
++ all-tag-list\r
++ (notmuch-tag-completions search-terms))))\r
++ (tag-list (append add-tag-list remove-tag-list))\r
++ (crm-separator " ")\r
++ ;; By default, space is bound to "complete word" function.\r
++ ;; Re-bind it to insert a space instead. Note that <tab>\r
++ ;; still does the completion.\r
++ (crm-local-completion-map\r
++ (let ((map (make-sparse-keymap)))\r
++ (set-keymap-parent map crm-local-completion-map)\r
++ (define-key map " " 'self-insert-command)\r
++ map)))\r
++ (delete "" (completing-read-multiple "Tags (+add -drop): "\r
++ tag-list nil nil initial-input))))\r
++\r
++(defun notmuch-update-tags (tags tag-changes)\r
++ "Return a copy of TAGS with additions and removals from TAG-CHANGES.\r
++\r
++TAG-CHANGES must be a list of tags names, each prefixed with\r
++either a \"+\" to indicate the tag should be added to TAGS if not\r
++present or a \"-\" to indicate that the tag should be removed\r
++from TAGS if present."\r
++ (let ((result-tags (copy-sequence tags)))\r
++ (dolist (tag-change tag-changes)\r
++ (let ((op (string-to-char tag-change))\r
++ (tag (unless (string= tag-change "") (substring tag-change 1))))\r
++ (case op\r
++ (?+ (unless (member tag result-tags)\r
++ (push tag result-tags)))\r
++ (?- (setq result-tags (delete tag result-tags)))\r
++ (otherwise\r
++ (error "Changed tag must be of the form `+this_tag' or `-that_tag'")))))\r
++ (sort result-tags 'string<)))\r
+ \r
+ (defun notmuch-foreach-mime-part (function mm-handle)\r
+ (cond ((stringp (car mm-handle))\r
+@@ -447,6 +465,10 @@ Complete list of currently available key bindings:\r
+ "Return a list of threads for the current region"\r
+ (notmuch-search-properties-in-region 'notmuch-search-thread-id beg end))\r
+ \r
++(defun notmuch-search-find-thread-id-region-search (beg end)\r
++ "Return a search string for threads for the current region"\r
++ (mapconcat 'identity (notmuch-search-find-thread-id-region beg end) " or "))\r
++\r
+ (defun notmuch-search-find-authors ()\r
+ "Return the authors for the current thread"\r
+ (get-text-property (point) 'notmuch-search-authors))\r
+@@ -584,74 +606,53 @@ the messages that were tagged"\r
+ (forward-line 1))\r
+ output)))\r
+ \r
+-(defun notmuch-search-add-tag-thread (tag)\r
+- (notmuch-search-add-tag-region tag (point) (point)))\r
++(defun notmuch-search-tag-thread (&rest tags)\r
++ "Change tags for the currently selected thread.\r
+ \r
+-(defun notmuch-search-add-tag-region (tag beg end)\r
+- (let ((search-id-string (mapconcat 'identity (notmuch-search-find-thread-id-region beg end) " or ")))\r
+- (notmuch-tag search-id-string (concat "+" tag))\r
+- (save-excursion\r
+- (let ((last-line (line-number-at-pos end))\r
+- (max-line (- (line-number-at-pos (point-max)) 2)))\r
+- (goto-char beg)\r
+- (while (<= (line-number-at-pos) (min last-line max-line))\r
+- (notmuch-search-set-tags (delete-dups (sort (cons tag (notmuch-search-get-tags)) 'string<)))\r
+- (forward-line))))))\r
++See `notmuch-search-tag-region' for details."\r
++ (apply 'notmuch-search-tag-region (point) (point) tags))\r
+ \r
+-(defun notmuch-search-remove-tag-thread (tag)\r
+- (notmuch-search-remove-tag-region tag (point) (point)))\r
++(defun notmuch-search-tag-region (beg end &rest tags)\r
++ "Change tags for threads in the given region.\r
+ \r
+-(defun notmuch-search-remove-tag-region (tag beg end)\r
+- (let ((search-id-string (mapconcat 'identity (notmuch-search-find-thread-id-region beg end) " or ")))\r
+- (notmuch-tag search-id-string (concat "-" tag))\r
++TAGS is a list of tag operations for `notmuch-tag'. The tags are\r
++added or removed for all threads in the region from BEG to END."\r
++ (let ((search-string (notmuch-search-find-thread-id-region-search beg end)))\r
++ (apply 'notmuch-tag search-string tags)\r
+ (save-excursion\r
+ (let ((last-line (line-number-at-pos end))\r
+ (max-line (- (line-number-at-pos (point-max)) 2)))\r
+ (goto-char beg)\r
+ (while (<= (line-number-at-pos) (min last-line max-line))\r
+- (notmuch-search-set-tags (delete tag (notmuch-search-get-tags)))\r
++ (notmuch-search-set-tags\r
++ (notmuch-update-tags (notmuch-search-get-tags) tags))\r
+ (forward-line))))))\r
+ \r
+-(defun notmuch-search-add-tag (tag)\r
+- "Add a tag to the currently selected thread or region.\r
+-\r
+-The tag is added to all messages in the currently selected thread\r
+-or threads in the current region."\r
+- (interactive\r
+- (list (notmuch-select-tag-with-completion "Tag to add: ")))\r
+- (save-excursion\r
+- (if (region-active-p)\r
+- (let* ((beg (region-beginning))\r
+- (end (region-end)))\r
+- (notmuch-search-add-tag-region tag beg end))\r
+- (notmuch-search-add-tag-thread tag))))\r
+-\r
+-(defun notmuch-search-remove-tag (tag)\r
+- "Remove a tag from the currently selected thread or region.\r
++(defun notmuch-search-tag (&optional initial-input)\r
++ "Change tags for the currently selected thread or region."\r
++ (interactive)\r
++ (let* ((beg (if (region-active-p) (region-beginning) (point)))\r
++ (end (if (region-active-p) (region-end) (point)))\r
++ (search-string (notmuch-search-find-thread-id-region-search beg end))\r
++ (tags (notmuch-read-tag-changes initial-input search-string)))\r
++ (apply 'notmuch-search-tag-region beg end tags)))\r
++\r
++(defun notmuch-search-add-tag ()\r
++ "Same as `notmuch-search-tag' but sets initial input to '+'."\r
++ (interactive)\r
++ (notmuch-search-tag "+"))\r
+ \r
+-The tag is removed from all messages in the currently selected\r
+-thread or threads in the current region."\r
+- (interactive\r
+- (list (notmuch-select-tag-with-completion\r
+- "Tag to remove: "\r
+- (if (region-active-p)\r
+- (mapconcat 'identity\r
+- (notmuch-search-find-thread-id-region (region-beginning) (region-end))\r
+- " ")\r
+- (notmuch-search-find-thread-id)))))\r
+- (save-excursion\r
+- (if (region-active-p)\r
+- (let* ((beg (region-beginning))\r
+- (end (region-end)))\r
+- (notmuch-search-remove-tag-region tag beg end))\r
+- (notmuch-search-remove-tag-thread tag))))\r
++(defun notmuch-search-remove-tag ()\r
++ "Same as `notmuch-search-tag' but sets initial input to '-'."\r
++ (interactive)\r
++ (notmuch-search-tag "-"))\r
+ \r
+ (defun notmuch-search-archive-thread ()\r
+ "Archive the currently selected thread (remove its \"inbox\" tag).\r
+ \r
+ This function advances the next thread when finished."\r
+ (interactive)\r
+- (notmuch-search-remove-tag-thread "inbox")\r
++ (notmuch-search-tag-thread "-inbox")\r
+ (notmuch-search-next-thread))\r
+ \r
+ (defvar notmuch-search-process-filter-data nil\r
+@@ -886,9 +887,7 @@ will prompt for tags to be added or removed. Tags prefixed with\r
+ Each character of the tag name may consist of alphanumeric\r
+ characters as well as `_.+-'.\r
+ "\r
+- (interactive (notmuch-select-tags-with-completion\r
+- "Operations (+add -drop): notmuch tag "\r
+- '("+" "-")))\r
++ (interactive (notmuch-read-tag-changes))\r
+ (apply 'notmuch-tag notmuch-search-query-string actions))\r
+ \r
+ (defun notmuch-search-buffer-title (query)\r
+-- \r
+1.7.9\r
+\r
projects / notmuch-archives.git / commitdiff