From: Carl Worth <cworth@cworth.org>
Date: Wed, 11 Nov 2009 02:45:30 +0000 (-0800)
Subject: notmuch.el: Simplify get-message-id
X-Git-Tag: 0.1~541
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=54d79f60a19566493593c0399a27ced0f0aa72e2

notmuch.el: Simplify get-message-id

We were stripping off the "id:" portion of the identifier, only to
put it back on again in all cases. Stop this madness.
---

diff --git a/notmuch.el b/notmuch.el
index c8639be5..34e43942 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -68,7 +68,7 @@
 (set 'notmuch-show-part-end-regexp         "part}")
 (set 'notmuch-show-marker-regexp "\\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$")
 
-(set 'notmuch-show-id-regexp "id:\\([^ ]*\\)")
+(set 'notmuch-show-id-regexp "\\(id:[^ ]*\\)")
 (set 'notmuch-show-filename-regexp "filename:\\(.*\\)$")
 (set 'notmuch-show-tags-regexp "(\\([^)]*\\))$")
 
@@ -153,7 +153,7 @@ Unlike builtin `next-line' this version accepts no arguments."
   (apply 'notmuch-call-notmuch-process
 	 (append (cons "tag"
 		       (mapcar (lambda (s) (concat "+" s)) toadd))
-		 (cons (concat "id:" (notmuch-show-get-message-id)) nil)))
+		 (cons (notmuch-show-get-message-id) nil)))
   (notmuch-show-set-tags (sort (union toadd (notmuch-show-get-tags) :test 'string=) 'string<)))
 
 (defun notmuch-show-remove-tag (&rest toremove)
@@ -165,7 +165,7 @@ Unlike builtin `next-line' this version accepts no arguments."
 	  (apply 'notmuch-call-notmuch-process
 		 (append (cons "tag"
 			       (mapcar (lambda (s) (concat "-" s)) toremove))
-			 (cons (concat "id:" (notmuch-show-get-message-id)) nil)))
+			 (cons (notmuch-show-get-message-id) nil)))
 	  (notmuch-show-set-tags (sort (set-difference tags toremove :test 'string=) 'string<))))))
 
 (defun notmuch-show-archive-thread-maybe-mark-read (markread)