From 83f531ad7ee4b9e9aacac4f45148c39101f17ab8 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Wed, 21 May 2014 10:58:50 +0100 Subject: emacs: make sure tagging on an empty query is harmless Currently notmuch-tag throws a "wrong-type-argument stringp nil" if passed a nil query-string. Catch this and provide a more useful error message. This fixes a case in notmuch-tree (if you try to tag when at the end of the buffer). Secondly, as pointed out by David (dme) `notmuch-search-find-stable-query-region' can return the query string () if there are no messages in the region. This gets passed to notmuch tag, and due to interactions in the optimize_query code in notmuch-tag.c becomes, in the case tag-change is -inbox, "( () ) and (tag:inbox)". This query matches some strange collection of messages which then get archived. This should probably be fixed, but in any case make `notmuch-search-find-stable-query-region' return a nil query-string in this case. This avoids data-loss (random tag removal) in this case. --- emacs/notmuch-tag.el | 2 ++ emacs/notmuch.el | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'emacs') diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el index 07c260eb..f54aa9d6 100644 --- a/emacs/notmuch-tag.el +++ b/emacs/notmuch-tag.el @@ -387,6 +387,8 @@ notmuch-after-tag-hook will be run." (unless (string-match-p "^[-+]\\S-+$" tag-change) (error "Tag must be of the form `+this_tag' or `-that_tag'"))) tag-changes) + (unless query + (error "Nothing to tag!")) (unless (null tag-changes) (run-hooks 'notmuch-before-tag-hook) (if (<= (length query) notmuch-tag-argument-limit) diff --git a/emacs/notmuch.el b/emacs/notmuch.el index 6c0bc1bc..1adea9c2 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -428,14 +428,16 @@ matched and unmatched messages in the current thread." "Return the stable query for the current region. If ONLY-MATCHED is non-nil, include only matched messages. If it -is nil, include both matched and unmatched messages." +is nil, include both matched and unmatched messages. If there are +no messages in the region then return nil." (let ((query-list nil) (all (not only-matched))) (dolist (queries (notmuch-search-properties-in-region :query beg end)) (when (first queries) (push (first queries) query-list)) (when (and all (second queries)) (push (second queries) query-list))) - (concat "(" (mapconcat 'identity query-list ") or (") ")"))) + (when query-list + (concat "(" (mapconcat 'identity query-list ") or (") ")")))) (defun notmuch-search-find-authors () "Return the authors for the current thread" -- cgit v1.2.3