notmuch.el: quote args in notmuch-show to facilitate remote use

[notmuch] / emacs / notmuch-show.el

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index a2383ebc20b5c5e7cf5d7f0bec8037142c03e47d..81276d90f32eb2104939afd73c8f6bd5b1ed991c 100644 (file)
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -110,7 +110,7 @@ Can use up to one integer format parameter, i.e. %d")
 (defvar notmuch-show-signature-lines-max 12
   "Maximum length of signature that will be hidden by default.")
 
-(defvar notmuch-show-citation-lines-prefix 4
+(defvar notmuch-show-citation-lines-prefix 3
   "Always show at least this many lines at the start of a citation.
 
 If there is one more line than the sum of
@@ -118,7 +118,7 @@ If there is one more line than the sum of
 `notmuch-show-citation-lines-suffix', show that, otherwise
 collapse remaining lines into a button.")
 
-(defvar notmuch-show-citation-lines-suffix 0
+(defvar notmuch-show-citation-lines-suffix 3
   "Always show at least this many lines at the end of a citation.
 
 If there is one more line than the sum of
@@ -1006,8 +1006,10 @@ used."
       (erase-buffer)
       (goto-char (point-min))
       (save-excursion
-       (let* ((basic-args (list notmuch-command nil t nil "show" "--entire-thread" thread-id))
-               (args (if query-context (append basic-args (list "and (" query-context ")")) basic-args)))
+       (let* ((basic-args (list notmuch-command nil t nil "show" "--entire-thread" "\'" thread-id))
+               (args (if query-context
+                         (append basic-args (list "and (" query-context ")\'"))
+                       (append basic-args (list "\'")))))
          (apply 'call-process args)
          (when (and (eq (buffer-size) 0) query-context)
            (apply 'call-process basic-args)))