debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-01 07:04:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: notmuch-start-notmuch: remove backward compatibility code

Browse source 
We no longer support Emacs releases before version 25.1.

Also adjust the sentinels which only had to deal with
an error file when using an older Emacs release was used.
This commit is contained in:
Jonas Bernoulli 2021-01-10 15:00:40 +01:00 committed by David Bremner
parent d931758a15
commit 0afb3f8b21
1 changed files with 17 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
emacs/notmuch-lib.el
View file

@ -896,42 +896,19 @@ when the process exits, or nil for none. The caller must *not*
invoke `set-process-sentinel' directly on the returned process, invoke `set-process-sentinel' directly on the returned process,
as that will interfere with the handling of stderr and the exit as that will interfere with the handling of stderr and the exit
status." status."
(let (err-file err-buffer proc err-proc (let* ((command (or (executable-find notmuch-command)
;; Find notmuch using Emacs' `exec-path' (error "Command not found: %s" notmuch-command)))
(command (or (executable-find notmuch-command) (err-buffer (generate-new-buffer " *notmuch-stderr*"))
(error "Command not found: %s" notmuch-command)))) (proc (make-process
(if (fboundp 'make-process) :name name
(progn :buffer buffer
(setq err-buffer (generate-new-buffer " *notmuch-stderr*")) :command (cons command args)
;; Emacs 25 and newer has `make-process', which allows :connection-type 'pipe
;; redirecting stderr independently from stdout to a :stderr err-buffer))
;; separate buffer. As this allows us to avoid using a (err-proc (get-buffer-process err-buffer)))
;; temporary file and shell invocation, use it when (process-put err-proc 'err-buffer err-buffer)
;; available. (set-process-sentinel err-proc #'notmuch-start-notmuch-error-sentinel)
(setq proc (make-process (process-put proc 'err-buffer err-buffer)
:name name
:buffer buffer
:command (cons command args)
:connection-type 'pipe
:stderr err-buffer))
(setq err-proc (get-buffer-process err-buffer))
(process-put proc 'err-buffer err-buffer)
(process-put err-proc 'err-file err-file)
(process-put err-proc 'err-buffer err-buffer)
(set-process-sentinel err-proc #'notmuch-start-notmuch-error-sentinel))
;; On Emacs versions before 25, there is no way to capture
;; stdout and stderr separately for asynchronous processes, or
;; even to redirect stderr to a file, so we use a trivial shell
;; wrapper to send stderr to a temporary file and clean things
;; up in the sentinel.
(setq err-file (make-temp-file "nmerr"))
(let ((process-connection-type nil)) ;; Use a pipe
(setq proc (apply #'start-process name buffer
"/bin/sh" "-c"
"exec 2>\"$1\"; shift; exec \"$0\" \"$@\""
command err-file args)))
(process-put proc 'err-file err-file))
(process-put proc 'sub-sentinel sentinel) (process-put proc 'sub-sentinel sentinel)
(process-put proc 'real-command (cons notmuch-command args)) (process-put proc 'real-command (cons notmuch-command args))
(set-process-sentinel proc #'notmuch-start-notmuch-sentinel) (set-process-sentinel proc #'notmuch-start-notmuch-sentinel)
@ -939,9 +916,7 @@ status."
(defun notmuch-start-notmuch-sentinel (proc event) (defun notmuch-start-notmuch-sentinel (proc event)
"Process sentinel function used by `notmuch-start-notmuch'." "Process sentinel function used by `notmuch-start-notmuch'."
(let* ((err-file (process-get proc 'err-file)) (let* ((err-buffer (process-get proc 'err-buffer))
(err-buffer (or (process-get proc 'err-buffer)
(find-file-noselect err-file)))
(err (and (not (zerop (buffer-size err-buffer))) (err (and (not (zerop (buffer-size err-buffer)))
(with-current-buffer err-buffer (buffer-string)))) (with-current-buffer err-buffer (buffer-string))))
(sub-sentinel (process-get proc 'sub-sentinel)) (sub-sentinel (process-get proc 'sub-sentinel))
@ -977,16 +952,11 @@ status."
(error (error
;; Emacs behaves strangely if an error escapes from a sentinel, ;; Emacs behaves strangely if an error escapes from a sentinel,
;; so turn errors into messages. ;; so turn errors into messages.
(message "%s" (error-message-string err)))) (message "%s" (error-message-string err))))))
(when err-file (ignore-errors (delete-file err-file)))))
(defun notmuch-start-notmuch-error-sentinel (proc event) (defun notmuch-start-notmuch-error-sentinel (proc event)
(let* ((err-file (process-get proc 'err-file)) (let ((buffer (process-get proc 'err-buffer)))
;; When `make-process' is available, use the error buffer (kill-buffer buffer)))
;; associated with the process, otherwise the error file.
(err-buffer (or (process-get proc 'err-buffer)
(find-file-noselect err-file))))
(when err-buffer (kill-buffer err-buffer))))
(defvar-local notmuch-show-process-crypto nil) (defvar-local notmuch-show-process-crypto nil)