From ddc44ae0d02c7f92640b5e560fca5fddbd7b6c98 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Thu, 24 Oct 2013 11:19:05 -0400 Subject: [PATCH] emacs: Move `notmuch-call-notmuch-process' to notmuch-lib Previously, this was in notmuch.el, but all of the other notmuch call wrappers were in notmuch-lib.el. Move `notmuch-call-notmuch-process' to live with its friends. This happens to fix a missing dependency from notmuch-tag.el, which required notmuch-lib, but not notmuch. --- emacs/notmuch-lib.el | 11 +++++++++++ emacs/notmuch.el | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index 921ed208..b8d0198d 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -628,6 +628,17 @@ You may need to restart Emacs or upgrade your notmuch package.")) ;; `notmuch-logged-error' does not return. )))) +(defun notmuch-call-notmuch-process (&rest args) + "Synchronously invoke \"notmuch\" with the given list of arguments. + +If notmuch exits with a non-zero status, output from the process +will appear in a buffer named \"*Notmuch errors*\" and an error +will be signaled." + (with-temp-buffer + (let ((status (apply #'call-process notmuch-command nil t nil args))) + (notmuch-check-exit-status status (cons notmuch-command args) + (buffer-string))))) + (defun notmuch-call-notmuch-sexp (&rest args) "Invoke `notmuch-command' with ARGS and return the parsed S-exp output. diff --git a/emacs/notmuch.el b/emacs/notmuch.el index 2c9a07c1..b11ef60b 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -465,17 +465,6 @@ If BARE is set then do not prefix with \"thread:\"" (let ((message-id (notmuch-search-find-thread-id))) (notmuch-mua-new-reply message-id prompt-for-sender nil))) -(defun notmuch-call-notmuch-process (&rest args) - "Synchronously invoke \"notmuch\" with the given list of arguments. - -If notmuch exits with a non-zero status, output from the process -will appear in a buffer named \"*Notmuch errors*\" and an error -will be signaled." - (with-temp-buffer - (let ((status (apply #'call-process notmuch-command nil t nil args))) - (notmuch-check-exit-status status (cons notmuch-command args) - (buffer-string))))) - (defun notmuch-search-set-tags (tags &optional pos) (let ((new-result (plist-put (notmuch-search-get-result pos) :tags tags))) (notmuch-search-update-result new-result pos)))