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

emacs: avoid passing around some redundant information

Browse source 
When running "notmuch" we use its full path but when displaying the
command to the user we show just its name for readability reasons.
Avoid passing around both representations because it is very easy
to get the name from the path.

Notmuch itself uses the involved functions just for "notmuch" but
there might be extensions that use them for other executable so we
forgo other potential simplifications.
This commit is contained in:
Jonas Bernoulli 2021-01-10 15:00:44 +01:00 committed by David Bremner
parent 778950872d
commit 904ffbc925
1 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
emacs/notmuch-lib.el
View file

@ -800,20 +800,27 @@ You may need to restart Emacs or upgrade your notmuch Emacs package."))
Emacs requested a newer output format than supported by the notmuch CLI. Emacs requested a newer output format than supported by the notmuch CLI.
You may need to restart Emacs or upgrade your notmuch package.")) You may need to restart Emacs or upgrade your notmuch package."))
(t (t
(let* ((command-string (pcase-let*
(mapconcat (lambda (arg) ((`(,command . ,args) command)
(shell-quote-argument (command (if (equal (file-name-nondirectory command)
(cond ((stringp arg) arg) notmuch-command)
((symbolp arg) (symbol-name arg)) notmuch-command
(t "*UNKNOWN ARGUMENT*")))) command))
command " ")) (command-string
(extra (mapconcat (lambda (arg)
(concat "command: " command-string "\n" (shell-quote-argument
(if (integerp exit-status) (cond ((stringp arg) arg)
(format "exit status: %s\n" exit-status) ((symbolp arg) (symbol-name arg))
(format "exit signal: %s\n" exit-status)) (t "*UNKNOWN ARGUMENT*"))))
(and err (concat "stderr:\n" err)) (cons command args)
(and output (concat "stdout:\n" output))))) " "))
(extra
(concat "command: " command-string "\n"
(if (integerp exit-status)
(format "exit status: %s\n" exit-status)
(format "exit signal: %s\n" exit-status))
(and err (concat "stderr:\n" err))
(and output (concat "stdout:\n" output)))))
(if err (if err
;; We have an error message straight from the CLI. ;; We have an error message straight from the CLI.
(notmuch-logged-error (notmuch-logged-error
@ -821,7 +828,7 @@ You may need to restart Emacs or upgrade your notmuch package."))
;; We only have combined output from the CLI; don't inundate ;; We only have combined output from the CLI; don't inundate
;; the user with it. Mimic `process-lines'. ;; the user with it. Mimic `process-lines'.
(notmuch-logged-error (format "%s exited with status %s" (notmuch-logged-error (format "%s exited with status %s"
(car command) exit-status) command exit-status)
extra)) extra))
;; `notmuch-logged-error' does not return. ;; `notmuch-logged-error' does not return.
)))) ))))
@ -908,7 +915,6 @@ status."
(err-proc (get-buffer-process err-buffer))) (err-proc (get-buffer-process err-buffer)))
(process-put proc 'err-buffer err-buffer) (process-put proc 'err-buffer err-buffer)
(process-put proc 'sub-sentinel sentinel) (process-put proc 'sub-sentinel sentinel)
(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)
(set-process-sentinel err-proc #'notmuch-start-notmuch-error-sentinel) (set-process-sentinel err-proc #'notmuch-start-notmuch-error-sentinel)
proc)) proc))
@ -919,8 +925,7 @@ status."
(err (and (buffer-live-p err-buffer) (err (and (buffer-live-p err-buffer)
(not (zerop (buffer-size err-buffer))) (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)))
(real-command (process-get proc 'real-command)))
(condition-case err (condition-case err
(progn (progn
;; Invoke the sub-sentinel, if any ;; Invoke the sub-sentinel, if any
@ -932,7 +937,7 @@ status."
;; and there's no point in telling the user that (but we ;; and there's no point in telling the user that (but we
;; still check for and report stderr output below). ;; still check for and report stderr output below).
(when (buffer-live-p (process-buffer proc)) (when (buffer-live-p (process-buffer proc))
(notmuch-check-async-exit-status proc event real-command err)) (notmuch-check-async-exit-status proc event nil err))
;; If that didn't signal an error, then any error output was ;; If that didn't signal an error, then any error output was
;; really warning output. Show warnings, if any. ;; really warning output. Show warnings, if any.
(let ((warnings (let ((warnings