From 74b54fb0faff4a6f69f1cf54dba9ac39e9aa754c Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 3 Sep 2016 23:59:38 +0100 Subject: [PATCH] emacs: notmuch-check-exit-status bugfix 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. --- emacs/notmuch-lib.el | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index 1781af48..2f015b0d 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -790,9 +790,15 @@ You may need to restart Emacs or upgrade your notmuch package.")) (insert-file-contents err-file) (unless (eobp) (buffer-string))))) + (command-string + (mapconcat (lambda (arg) + (shell-quote-argument + (cond ((stringp arg) arg) + ((symbolp arg) (symbol-name arg)) + (t "*UNKNOWN ARGUMENT*")))) + command " ")) (extra - (concat - "command: " (mapconcat #'shell-quote-argument command " ") "\n" + (concat "command: " command-string "\n" (if (integerp exit-status) (format "exit status: %s\n" exit-status) (format "exit signal: %s\n" exit-status))