unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH v2 1/6] emacs: notmuch-check-exit-status bugfix
Date: Sat,  3 Sep 2016 23:59:38 +0100	[thread overview]
Message-ID: <1472943583-4547-2-git-send-email-markwalters1009@gmail.com> (raw)
In-Reply-To: <1472943583-4547-1-git-send-email-markwalters1009@gmail.com>

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 1781af4..2f015b0 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))
-- 
2.1.4

  reply	other threads:[~2016-09-03 22:59 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-03 22:59 [PATCH v2 0/6] Use notmuch insert for fcc Mark Walters
2016-09-03 22:59 ` Mark Walters [this message]
2016-09-04 11:31   ` [PATCH v2 1/6] emacs: notmuch-check-exit-status bugfix David Bremner
2016-09-03 22:59 ` [PATCH v2 2/6] emacs: maildir-fcc: prepare for use of notmuch insert Mark Walters
2016-09-03 22:59 ` [PATCH v2 3/6] emacs: maildir import message-do-fcc Mark Walters
2016-09-03 22:59 ` [PATCH v2 4/6] emacs: simplify our local copy of message-do-fcc Mark Walters
2016-09-03 22:59 ` [PATCH v2 5/6] Modify " Mark Walters
2016-09-03 22:59 ` [PATCH v2 6/6] emacs: maildir: add the actual insert code Mark Walters

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1472943583-4547-2-git-send-email-markwalters1009@gmail.com \
    --to=markwalters1009@gmail.com \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).