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

emacs: notmuch-check-exit-status bugfix

Browse source 
This function prints diagnostic information in the event of an
error. However, one of the callers has an optional :stdin-string
keyword argument. This causes the error printing routine to error
itself.

Rather than reach notmuch-check-exit-status about the possible keyword
arguments (currently only one but could be more in the future) this
commit just tells notmuch-check-exit-status how to print non-string arguments.
This commit is contained in:
Mark Walters 2016-09-03 23:59:38 +01:00 committed by David Bremner
parent e0e6a17675
commit 74b54fb0fa
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
emacs/notmuch-lib.el
View file

@ -790,9 +790,15 @@ You may need to restart Emacs or upgrade your notmuch package."))
(insert-file-contents err-file) (insert-file-contents err-file)
(unless (eobp) (unless (eobp)
(buffer-string))))) (buffer-string)))))
(command-string
(mapconcat (lambda (arg)
(shell-quote-argument
(cond ((stringp arg) arg)
((symbolp arg) (symbol-name arg))
(t "*UNKNOWN ARGUMENT*"))))
command " "))
(extra (extra
(concat (concat "command: " command-string "\n"
"command: " (mapconcat #'shell-quote-argument command " ") "\n"
(if (integerp exit-status) (if (integerp exit-status)
(format "exit status: %s\n" exit-status) (format "exit status: %s\n" exit-status)
(format "exit signal: %s\n" exit-status)) (format "exit signal: %s\n" exit-status))