X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-query.el;h=1db9d7cadfb450a7f157b5fe44ed28fa7a3619e2;hb=dfb1b8eb89e814f4bf6f6e62b700c72aa1b4659a;hp=51d427f230038caf8782be5afafca11ca072c644;hpb=43251ab653a20c0f7cca709d36da895c3558e125;p=notmuch
diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el
index 51d427f2..1db9d7ca 100644
--- a/emacs/notmuch-query.el
+++ b/emacs/notmuch-query.el
@@ -1,4 +1,4 @@
-;; notmuch-query.el --- provide an emacs api to query notmuch
+;;; notmuch-query.el --- provide an emacs api to query notmuch
;;
;; Copyright © David Bremner
;;
@@ -15,23 +15,23 @@
;; General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
-;; along with Notmuch. If not, see .
+;; along with Notmuch. If not, see .
;;
;; Authors: David Bremner
+;;; Code:
+
(require 'notmuch-lib)
-(require 'json)
(defun notmuch-query-get-threads (search-terms)
"Return a list of threads of messages matching SEARCH-TERMS.
A thread is a forest or list of trees. A tree is a two element
list where the first element is a message, and the second element
-is a possibly empty forest of replies.
-"
- (let ((args '("show" "--format=sexp" "--format-version=1")))
+is a possibly empty forest of replies."
+ (let ((args '("show" "--format=sexp" "--format-version=4")))
(if notmuch-show-process-crypto
- (setq args (append args '("--decrypt"))))
+ (setq args (append args '("--decrypt=true"))))
(setq args (append args search-terms))
(apply #'notmuch-call-notmuch-sexp args)))
@@ -39,28 +39,28 @@ is a possibly empty forest of replies.
;; Mapping functions across collections of messages.
(defun notmuch-query-map-aux (mapper function seq)
- "private function to do the actual mapping and flattening"
+ "Private function to do the actual mapping and flattening."
(apply 'append
(mapcar
- (lambda (tree)
- (funcall mapper function tree))
- seq)))
+ (lambda (tree)
+ (funcall mapper function tree))
+ seq)))
(defun notmuch-query-map-threads (fn threads)
- "apply FN to every thread in THREADS. Flatten results to a list.
+ "Apply FN to every thread in THREADS. Flatten results to a list.
See the function notmuch-query-get-threads for more information."
(notmuch-query-map-aux 'notmuch-query-map-forest fn threads))
(defun notmuch-query-map-forest (fn forest)
- "apply function to every message in a forest. Flatten results to a list.
+ "Apply function to every message in a forest. Flatten results to a list.
See the function notmuch-query-get-threads for more information.
"
(notmuch-query-map-aux 'notmuch-query-map-tree fn forest))
(defun notmuch-query-map-tree (fn tree)
- "Apply function FN to every message in TREE. Flatten results to a list
+ "Apply function FN to every message in TREE. Flatten results to a list.
See the function notmuch-query-get-threads for more information."
(cons (funcall fn (car tree)) (notmuch-query-map-forest fn (cadr tree))))
@@ -69,9 +69,11 @@ See the function notmuch-query-get-threads for more information."
;; Predefined queries
(defun notmuch-query-get-message-ids (&rest search-terms)
- "Return a list of message-ids of messages that match SEARCH-TERMS"
+ "Return a list of message-ids of messages that match SEARCH-TERMS."
(notmuch-query-map-threads
(lambda (msg) (plist-get msg :id))
(notmuch-query-get-threads search-terms)))
(provide 'notmuch-query)
+
+;;; notmuch-query.el ends here