From: Mark Walters <markwalters1009@gmail.com>
Date: Sat, 10 Nov 2012 17:02:18 +0000 (+0000)
Subject: contrib: pick: bugfix when trying to show a non-message
X-Git-Tag: 0.15_rc1~170
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=96d9f54615b404011c11fecdea6135fe684c7235

contrib: pick: bugfix when trying to show a non-message

If the user pressed return on the end result status line it gave a
blank message. Modify the function notmuch-pick-get-message-id to
return nil rather than an empty message-id in this case to fix this.

This also fixes a bug in the (lack of) quoting of the id string.
---

diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
index be6a91a7..db2a7cb9 100644
--- a/contrib/notmuch-pick/notmuch-pick.el
+++ b/contrib/notmuch-pick/notmuch-pick.el
@@ -241,7 +241,10 @@ Some useful entries are:
 
 (defun notmuch-pick-get-message-id ()
   "Return the message id of the current message."
-  (concat "id:\"" (notmuch-pick-get-prop :id) "\""))
+  (let ((id (notmuch-pick-get-prop :id)))
+    (if id
+	(notmuch-id-to-query id)
+      nil)))
 
 (defun notmuch-pick-get-match ()
   "Return whether the current message is a match."