diff options
| author |  David Bremner <bremner@debian.org> | 2013-03-08 09:04:38 -0400 |
|---|---|---|
| committer |  David Bremner <bremner@unb.ca> | 2013-04-01 07:58:20 -0400 |
| commit | abd4d6b92e488109a155fdee27285e6df485c583 (patch) | |
| tree | 652c0b05d756b11f25cd292cdcb837a59ec335ac /emacs | |
| parent | 6b405143d76bdbb99a101ae88b2e63224371d911 (diff) | |
emacs: introduce notmuch-command-to-string, replace use of shell-command-to-string
This has two benefits: unified error handling, and avoiding tramp's
hooking into shell-command-string.
This seems to be a fix for id:874nguxbvq.fsf@tu-dortmund.de
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/notmuch-lib.el | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index f3ff3af5..85950da1 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -112,13 +112,25 @@ For example, if you wanted to remove an \"inbox\" tag and add an (select-window (posn-window (event-start last-input-event))) (button-activate button))) +(defun notmuch-command-to-string (&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. + +Otherwise the output will be returned" + (with-temp-buffer + (let* ((status (apply #'call-process notmuch-command nil t nil args)) + (output (buffer-string))) + (notmuch-check-exit-status status (cons notmuch-command args) output) + output))) + (defun notmuch-version () "Return a string with the notmuch version number." (let ((long-string ;; Trim off the trailing newline. - (substring (shell-command-to-string - (concat notmuch-command " --version")) - 0 -1))) + (substring (notmuch-command-to-string "--version") 0 -1))) (if (string-match "^notmuch\\( version\\)? \\(.*\\)$" long-string) (match-string 2 long-string) @@ -127,9 +139,7 @@ For example, if you wanted to remove an \"inbox\" tag and add an (defun notmuch-config-get (item) "Return a value from the notmuch configuration." ;; Trim off the trailing newline - (substring (shell-command-to-string - (concat notmuch-command " config get " item)) - 0 -1)) + (substring (notmuch-command-to-string "config" "get" item) 0 -1)) (defun notmuch-database-path () "Return the database.path value from the notmuch configuration." |