[PATCH 2/2] notmuch-emacs-mua: escape $PWD (and cd always)

diff --git a/56/85af5443ee934d427fa1138d336d3f377760af b/56/85af5443ee934d427fa1138d336d3f377760af
new file mode 100644 (file)
index 0000000..5a4b988
--- /dev/null
+++ b/56/85af5443ee934d427fa1138d336d3f377760af
@@ -0,0 +1,89 @@
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id CEA5F6DE0261\r
+ for <notmuch@notmuchmail.org>; Sat, 28 May 2016 04:06:28 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.254\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.254 tagged_above=-999 required=5 tests=[AWL=0.263, \r
+ HEADER_FROM_DIFFERENT_DOMAINS=0.001, T_RP_MATCHES_RCVD=-0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 5pRRm6me7S4l for <notmuch@notmuchmail.org>;\r
+ Sat, 28 May 2016 04:06:19 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id B91A66DE0127\r
+ for <notmuch@notmuchmail.org>; Sat, 28 May 2016 04:06:18 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id 4F3941000C6; Sat, 28 May 2016 14:06:06 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Cc: tomi.ollila@iki.fi\r
+Subject: [PATCH 2/2] notmuch-emacs-mua: escape $PWD (and cd always)\r
+Date: Sat, 28 May 2016 14:06:04 +0300\r
+Message-Id: <1464433564-13180-2-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 2.8.2\r
+In-Reply-To: <1464433564-13180-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <877fev1mcv.fsf@zancas.localnet>\r
+ <1464433564-13180-1-git-send-email-tomi.ollila@iki.fi>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 28 May 2016 11:06:28 -0000\r
+\r
+Escaping $PWD makes this work in directories like 'foo"bar'...\r
+\r
+Cd'ing always makes the working directory to be consistent whether\r
+--body option was used or not (when using emacsclient, but cd'ing\r
+when using emacs does not cause any harm).\r
+\r
+Note that documentation of `insert-file` expects programs to\r
+call `insert-file-contents` instead. In our simple case\r
+`insert-file` works better as it does some good checks that we'd\r
+have to implement ourselves. Look lisp/files.el in emacs sources\r
+for more information.\r
+---\r
+ notmuch-emacs-mua | 6 ++++--\r
+ 1 file changed, 4 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua\r
+index 1168c6f65a5f..fdb97443102b 100755\r
+--- a/notmuch-emacs-mua\r
++++ b/notmuch-emacs-mua\r
+@@ -39,8 +39,10 @@ USE_EMACSCLIENT=\r
+ AUTO_DAEMON=\r
+ CREATE_FRAME=\r
+ \r
++escape -v pwd "$PWD"\r
++\r
+ # The crux of it all: construct an elisp progn and eval it.\r
+-ELISP="(prog1 'done (require 'notmuch) (notmuch-mua-new-mail)"\r
++ELISP="(prog1 'done (require 'notmuch) (cd \"$pwd\") (notmuch-mua-new-mail)"\r
+ \r
+ # Short options compatible with mutt(1).\r
+ while getopts :s:c:b:i:h opt; do\r
+@@ -95,7 +97,7 @@ while getopts :s:c:b:i:h opt; do\r
+           ELISP="${ELISP} (message-goto-bcc) (insert \"${OPTARG}, \")"\r
+           ;;\r
+       --body|i)\r
+-          ELISP="${ELISP} (message-goto-body) (cd \"${PWD}\") (insert-file \"${OPTARG}\")"\r
++          ELISP="${ELISP} (message-goto-body) (insert-file \"${OPTARG}\")"\r
+           ;;\r
+       --print)\r
+           PRINT_ONLY=1\r
+-- \r
+2.8.2\r
+\r