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.
This commit is contained in:
Carl Worth 2009-11-10 18:45:30 -08:00
parent 357aba3ec8
commit 54d79f60a1

View file

@ -68,7 +68,7 @@
(set 'notmuch-show-part-end-regexp " part}") (set 'notmuch-show-part-end-regexp " part}")
(set 'notmuch-show-marker-regexp " \\(message\\|header\\|body\\|attachment\\|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-filename-regexp "filename:\\(.*\\)$")
(set 'notmuch-show-tags-regexp "(\\([^)]*\\))$") (set 'notmuch-show-tags-regexp "(\\([^)]*\\))$")
@ -153,7 +153,7 @@ Unlike builtin `next-line' this version accepts no arguments."
(apply 'notmuch-call-notmuch-process (apply 'notmuch-call-notmuch-process
(append (cons "tag" (append (cons "tag"
(mapcar (lambda (s) (concat "+" s)) toadd)) (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<))) (notmuch-show-set-tags (sort (union toadd (notmuch-show-get-tags) :test 'string=) 'string<)))
(defun notmuch-show-remove-tag (&rest toremove) (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 (apply 'notmuch-call-notmuch-process
(append (cons "tag" (append (cons "tag"
(mapcar (lambda (s) (concat "-" s)) toremove)) (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<)))))) (notmuch-show-set-tags (sort (set-difference tags toremove :test 'string=) 'string<))))))
(defun notmuch-show-archive-thread-maybe-mark-read (markread) (defun notmuch-show-archive-thread-maybe-mark-read (markread)