From 0073152e3fa7dd11d88de28e87eec7762cdbbbeb Mon Sep 17 00:00:00 2001 From: Matthieu Lemerre Date: Thu, 25 Feb 2010 00:25:51 +0100 Subject: [PATCH 2/2] Add support for deletion in the emacs interface Add "d" keybinding in notmuch-show and notmuch-summary to delete the current thread. Adds "D" keybinding to delete the current message in notmuch-show. Adds a "deleted" folder. Omit deleted items from searchs if no prefix arg. Adds history management to make searching deleted items more convenient. --- notmuch.el | 56 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 7 deletions(-) diff --git a/notmuch.el b/notmuch.el index 5d7342a..0285573 100644 --- a/notmuch.el +++ b/notmuch.el @@ -92,6 +92,8 @@ (define-key map "x" 'notmuch-show-archive-thread-then-exit) (define-key map "A" 'notmuch-show-mark-read-then-archive-thread) (define-key map "a" 'notmuch-show-archive-thread) + (define-key map "d" 'notmuch-show-delete-thread) + (define-key map "D" 'notmuch-show-delete-message) (define-key map "p" 'notmuch-show-previous-message) (define-key map "N" 'notmuch-show-mark-read-then-next-open-message) (define-key map "n" 'notmuch-show-next-message) @@ -380,6 +382,23 @@ buffer." (notmuch-show-archive-thread) (kill-this-buffer)) +(defun notmuch-show-delete-message () + "Delete current message (sets its deleted tag)." + (interactive) + (notmuch-show-add-tag "deleted")) + +(defun notmuch-show-delete-thread() + "Delete each message in thread." + (interactive) + (notmuch-show-forall-in-thread + (notmuch-show-delete-message))) + +(defun notmuch-show-delete-thread-and-exit() + "Delete each message in thread, then exit back to search results." + (interactive) + (notmuch-show-delete-thread) + (kill-this-buffer)) + (defun notmuch-show-mark-read-then-archive-then-exit () "Remove unread tags from thread, then archive and exit to search results." (interactive) @@ -1227,6 +1246,7 @@ matching this search term are shown if non-nil. " (define-key map [mouse-1] 'notmuch-search-show-thread) (define-key map "*" 'notmuch-search-operate-all) (define-key map "a" 'notmuch-search-archive-thread) + (define-key map "d" 'notmuch-search-delete-thread) (define-key map "-" 'notmuch-search-remove-tag) (define-key map "+" 'notmuch-search-add-tag) (define-key map (kbd "RET") 'notmuch-search-show-thread) @@ -1235,6 +1255,7 @@ matching this search term are shown if non-nil. " (fset 'notmuch-search-mode-map notmuch-search-mode-map) (defvar notmuch-search-query-string) +(defvar notmuch-search-history nil) (defvar notmuch-search-oldest-first t "Show the oldest mail first in the search-mode") @@ -1446,6 +1467,13 @@ This function advances the next thread when finished." (notmuch-search-remove-tag "inbox") (forward-line)) +(defun notmuch-search-delete-thread () + "Mark the currently selected thread as deleted (set its \"deleted\" tag). +This function advances the next thread when finished." + (interactive) + (notmuch-search-add-tag "deleted") + (forward-line)) + (defun notmuch-search-process-sentinel (proc msg) "Add a message to let user know when \"notmuch search\" exits" (let ((buffer (process-buffer proc)) @@ -1520,10 +1548,22 @@ characters as well as `_.+-'. (append action-split (list notmuch-search-query-string) nil)))) ;;;###autoload -(defun notmuch-search (query &optional oldest-first) - "Run \"notmuch search\" with the given query string and display results." - (interactive "sNotmuch search: ") - (let ((buffer (get-buffer-create (concat "*notmuch-search-" query "*")))) +(defun notmuch-search (query &optional oldest-first include-deleted) + "Run \"notmuch search\" with the given query string and display results. + +With prefix argument, include deleted items. +" + (interactive (let* ((prefix current-prefix-arg) + (query (if prefix + (read-string "Notmuch search (including deleted): " + notmuch-search-query-string + 'notmuch-search-history) + (read-string "Notmuch search: " nil + 'notmuch-search-history)))) + (list query nil prefix))) + (let ((real-query (if include-deleted query + (concat "not tag:deleted and (" query ")"))) + (buffer (get-buffer-create (concat "*notmuch-search-" query "*")))) (switch-to-buffer buffer) (notmuch-search-mode) (set 'notmuch-search-query-string query) @@ -1539,7 +1579,7 @@ characters as well as `_.+-'. (let ((proc (start-process-shell-command "notmuch-search" buffer notmuch-command "search" (if oldest-first "--sort=oldest-first" "--sort=newest-first") - (shell-quote-argument query)))) + (shell-quote-argument real-query)))) (set-process-sentinel proc 'notmuch-search-process-sentinel) (set-process-filter proc 'notmuch-search-process-filter)))) (run-hooks 'notmuch-search-hook))) @@ -1587,7 +1627,7 @@ search." Runs a new search matching only messages that match both the current search results AND the additional query string provided." - (interactive "sFilter search: ") + (interactive "sFilter search:") (let ((grouped-query (if (string-match-p notmuch-search-disjunctive-regexp query) (concat "( " query " )") query))) (notmuch-search (concat notmuch-search-query-string " and " grouped-query) notmuch-search-oldest-first))) @@ -1630,7 +1670,9 @@ current search results AND that are tagged with the given tag." (fset 'notmuch-folder-mode-map notmuch-folder-mode-map) -(defcustom notmuch-folders (quote (("inbox" . "tag:inbox") ("unread" . "tag:unread"))) +(defcustom notmuch-folders (quote (("inbox" . "tag:inbox") + ("unread" . "tag:unread") + ("deleted" . "tag:deleted"))) "List of searches for the notmuch folder view" :type '(alist :key-type (string) :value-type (string)) :group 'notmuch) -- 1.6.5