X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-lib.el;h=8deb7dee265ac9667204192777fe9c3b7c019083;hb=9a64b2df292858597c0bf632b8df69aa1dba07e4;hp=79a1290d4a69019b9c159c08ccf8b76f7ef22a38;hpb=c1a42652a173a4bb70ab72388e6ad150d19a2b06;p=notmuch

diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index 79a1290d..8deb7dee 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -467,13 +467,11 @@ You may need to restart Emacs or upgrade your notmuch package."))
 	;; `notmuch-logged-error' does not return.
 	))))
 
-(defun notmuch-call-notmuch-json (&rest args)
-  "Invoke `notmuch-command' with ARGS and return the parsed JSON output.
+(defun notmuch-call-notmuch-sexp (&rest args)
+  "Invoke `notmuch-command' with ARGS and return the parsed S-exp output.
 
-The returned output will represent objects using property lists
-and arrays as lists.  If notmuch exits with a non-zero status,
-this will pop up a buffer containing notmuch's output and signal
-an error."
+If notmuch exits with a non-zero status, this will pop up a
+buffer containing notmuch's output and signal an error."
 
   (with-temp-buffer
     (let ((err-file (make-temp-file "nmerr")))
@@ -483,10 +481,7 @@ an error."
 	    (notmuch-check-exit-status status (cons notmuch-command args)
 				       (buffer-string) err-file)
 	    (goto-char (point-min))
-	    (let ((json-object-type 'plist)
-		  (json-array-type 'list)
-		  (json-false 'nil))
-	      (json-read)))
+	    (read (current-buffer)))
 	(delete-file err-file)))))
 
 (defun notmuch-start-notmuch (name buffer sentinel &rest args)