[PATCH 2/2] notmuch-emacs-mua: escape $PWD (and cd always)
Tomi Ollila
tomi.ollila at iki.fi
Sat May 28 04:06:04 PDT 2016
Escaping $PWD makes this work in directories like 'foo"bar'...
Cd'ing always makes the working directory to be consistent whether
--body option was used or not (when using emacsclient, but cd'ing
when using emacs does not cause any harm).
Note that documentation of `insert-file` expects programs to
call `insert-file-contents` instead. In our simple case
`insert-file` works better as it does some good checks that we'd
have to implement ourselves. Look lisp/files.el in emacs sources
for more information.
---
notmuch-emacs-mua | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua
index 1168c6f65a5f..fdb97443102b 100755
--- a/notmuch-emacs-mua
+++ b/notmuch-emacs-mua
@@ -39,8 +39,10 @@ USE_EMACSCLIENT=
AUTO_DAEMON=
CREATE_FRAME=
+escape -v pwd "$PWD"
+
# The crux of it all: construct an elisp progn and eval it.
-ELISP="(prog1 'done (require 'notmuch) (notmuch-mua-new-mail)"
+ELISP="(prog1 'done (require 'notmuch) (cd \"$pwd\") (notmuch-mua-new-mail)"
# Short options compatible with mutt(1).
while getopts :s:c:b:i:h opt; do
@@ -95,7 +97,7 @@ while getopts :s:c:b:i:h opt; do
ELISP="${ELISP} (message-goto-bcc) (insert \"${OPTARG}, \")"
;;
--body|i)
- ELISP="${ELISP} (message-goto-body) (cd \"${PWD}\") (insert-file \"${OPTARG}\")"
+ ELISP="${ELISP} (message-goto-body) (insert-file \"${OPTARG}\")"
;;
--print)
PRINT_ONLY=1
--
2.8.2
More information about the notmuch
mailing list