diff options
| author | David Bremner <david@tethera.net> | 2021-08-29 12:23:30 -0700 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-09-11 10:19:27 -0300 |
| commit | 5e5f2122f91413e93761ca4a3d30b0b8b0d5e38e (patch) | |
| tree | 4364e0574098907a54fbf0e7b7acdb3d60e9f09a | |
| parent | a890241138ea468f8a275941b02da39b4e894c1e (diff) | |
emacs: wrap call-process-region
As with notmuch--process-lines, initial purpose is to provide a safe
binding for default-directory. This is enough to make notmuch-hello
robust against non-existent or corrupt values default-directory, but
probably not other views.
| -rw-r--r-- | emacs/notmuch-hello.el | 2 | ||||
| -rw-r--r-- | emacs/notmuch-lib.el | 10 | ||||
| -rw-r--r-- | emacs/notmuch-print.el | 2 | ||||
| -rwxr-xr-x | test/T440-emacs-hello.sh | 1 |
4 files changed, 11 insertions, 4 deletions
diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index 61494c02..71487bd9 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -569,7 +569,7 @@ options will be handled as specified for (or (plist-get options :filter-count) (plist-get options :filter)))) "\n"))) - (unless (= (call-process-region (point-min) (point-max) notmuch-command + (unless (= (notmuch--call-process-region (point-min) (point-max) notmuch-command t t nil "count" "--batch") 0) (notmuch-logged-error "notmuch count --batch failed" diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index 928286c3..207ea4c2 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -869,6 +869,14 @@ You may need to restart Emacs or upgrade your notmuch package.")) default" (notmuch--apply-with-env #'process-lines program args)) +(defun notmuch--call-process-region (start end program + &optional delete buffer display + &rest args) + "Wrap call-process-region, binding DEFAULT-DIRECTORY to a safe +default" + (notmuch--apply-with-env + #'call-process-region start end program delete buffer display args)) + (defun notmuch-call-notmuch--helper (destination args) "Helper for synchronous notmuch invocation commands. @@ -885,7 +893,7 @@ for `call-process'. ARGS is as described for (if (null stdin-string) (apply #'call-process notmuch-command nil destination nil args) (insert stdin-string) - (apply #'call-process-region (point-min) (point-max) + (apply #'notmuch--call-process-region (point-min) (point-max) notmuch-command t destination nil args)))) (defun notmuch-call-notmuch-process (&rest args) diff --git a/emacs/notmuch-print.el b/emacs/notmuch-print.el index d0061499..85fa1f21 100644 --- a/emacs/notmuch-print.el +++ b/emacs/notmuch-print.el @@ -48,7 +48,7 @@ "Pass the contents of the current buffer to 'muttprint'. Optional OUTPUT allows passing a list of flags to muttprint." - (apply #'call-process-region (point-min) (point-max) + (apply #'notmuch--call-process-region (point-min) (point-max) ;; Reads from stdin. "muttprint" nil nil nil diff --git a/test/T440-emacs-hello.sh b/test/T440-emacs-hello.sh index 9d1e5a9c..a1ed1c2b 100755 --- a/test/T440-emacs-hello.sh +++ b/test/T440-emacs-hello.sh @@ -69,7 +69,6 @@ notmuch tag -$tag '*' test_expect_equal_file $EXPECTED/notmuch-hello-long-names OUTPUT test_begin_subtest "notmuch-hello with nonexistent CWD" -test_subtest_known_broken test_emacs ' (notmuch-hello) (test-log-error |