From: Austin Clements <amdragon@MIT.EDU>
To: notmuch@notmuchmail.org
Cc: bjonnh-nm@bjonnh.net
Subject: [PATCH 2/4] emacs: Fix exception when fetching empty or unconfigured settings
Date: Thu, 20 Feb 2014 14:16:35 -0500 [thread overview]
Message-ID: <1392923797-17045-3-git-send-email-amdragon@mit.edu> (raw)
In-Reply-To: <1392923797-17045-1-git-send-email-amdragon@mit.edu>
When "notmuch config" is called with the name of an empty or
unconfigured setting, it prints nothing (not even a new line).
Previously, `notmuch-config-get' assumed it would always print a
newline. As a result, when `notmuch-config-get' was called with the
name of an empty of unconfigured setting, it would attempt to
(substring "" 0 -1) to strip the newline, which would fail with a
(args-out-of-range "" 0 -1) exception.
Fix this by only stripping the newline if there actually is one.
---
emacs/notmuch-lib.el | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index fa35fa9..09110b5 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -198,8 +198,13 @@ on the command line, and then retry your notmuch command")))
(defun notmuch-config-get (item)
"Return a value from the notmuch configuration."
- ;; Trim off the trailing newline
- (substring (notmuch-command-to-string "config" "get" item) 0 -1))
+ (let* ((val (notmuch-command-to-string "config" "get" item))
+ (len (length val)))
+ ;; Trim off the trailing newline (if the value is empty or not
+ ;; configured, there will be no newline)
+ (if (and (> len 0) (= (aref val (- len 1)) ?\n))
+ (substring val 0 -1)
+ val)))
(defun notmuch-database-path ()
"Return the database.path value from the notmuch configuration."
--
1.8.4.rc3
next prev parent reply other threads:[~2014-02-20 19:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-20 19:16 [PATCH 0/4] Bug fixes for identity handling in Emacs Austin Clements
2014-02-20 19:16 ` [PATCH 1/4] emacs: Build forwarded message buffer more directly Austin Clements
2014-02-20 19:16 ` Austin Clements [this message]
2014-02-20 19:16 ` [PATCH 3/4] emacs: Fix `notmuch-user-other-email' when no other emails are configured Austin Clements
2014-02-20 19:16 ` [PATCH 4/4] emacs: Simplify and fix `notmuch-mua-prompt-for-sender' Austin Clements
2014-02-20 22:36 ` Mark Walters
2014-02-21 2:17 ` Austin Clements
2014-02-27 18:10 ` [PATCH v2] " Austin Clements
2014-03-01 9:37 ` Mark Walters
2014-03-05 0:07 ` David Bremner
2014-02-22 10:17 ` [PATCH 4/4] " Tomi Ollila
2014-02-22 23:56 ` [PATCH 0/4] Bug fixes for identity handling in Emacs David Bremner
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=1392923797-17045-3-git-send-email-amdragon@mit.edu \
--to=amdragon@mit.edu \
--cc=bjonnh-nm@bjonnh.net \
--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).