Currently an attempt to stash a non-existent field (eg cc when not present) throws an error. Catch this case and give the user a warning message. --- This fixes the comment and stashes an empty string in the case there is nothing to stash (both suggested by Austin). emacs/notmuch-lib.el | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index 1d0ec17..5c44867 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -183,8 +183,14 @@ user-friendly queries." (defun notmuch-common-do-stash (text) "Common function to stash text in kill ring, and display in minibuffer." - (kill-new text) - (message "Stashed: %s" text)) + (if text + (progn + (kill-new text) + (message "Stashed: %s" text)) + ;; There is nothing to stash so stash an empty string so the user + ;; doesn't accidentally paste something else somewhere. + (kill-new "") + (message "Nothing to stash!"))) ;; -- 1.7.9.1