X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-emacs-mua;h=ac03a4a60d565e512f4062052757f8e20d267281;hp=b8cbc822fe89103874fcb6f73c5a7b8dd6aa44c7;hb=17fcf24d8b2dd6afcda2e3eaf40f9b7b51d8f30d;hpb=f4a5a534c8312bc46b7c561d5f4d26600a532d96

diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua
index b8cbc822..ac03a4a6 100755
--- a/notmuch-emacs-mua
+++ b/notmuch-emacs-mua
@@ -22,23 +22,29 @@
 
 set -eu
 
+# escape: "expand" '\' as '\\' and '"' as '\"'
+# calling convention: escape -v var "$arg" (like in bash printf).
 escape ()
 {
-    echo "${1//\"/\\\"}"
+    local __escape_arg__=${3//\\/\\\\}
+    printf -v $2 '%s' "${__escape_arg__//\"/\\\"}"
 }
 
 EMACS=${EMACS-emacs}
 EMACSCLIENT=${EMACSCLIENT-emacsclient}
 
 PRINT_ONLY=
+NO_WINDOW=
 USE_EMACSCLIENT=
-CLIENT_TYPE="-c"
+AUTO_DAEMON=
+CREATE_FRAME="-c"
 
 # The crux of it all: construct an elisp progn and eval it.
 ELISP="(prog1 'done (require 'notmuch) (notmuch-mua-new-mail)"
 ELISP="${ELISP} (setq message-exit-actions (list #'save-buffers-kill-terminal))"
 
-while getopts :s:c:b:i:hC opt; do
+# Short options compatible with mutt(1).
+while getopts :s:c:b:i:h opt; do
     # Handle errors and long options.
     case "${opt}" in
 	:)
@@ -59,7 +65,7 @@ while getopts :s:c:b:i:hC opt; do
 		    opt=${opt%%=*}
 		    ;;
 		# Long options without arguments.
-		--help|--print|--no-window-system|--client)
+		--help|--print|--no-window-system|--client|--auto-daemon)
 		    ;;
 		*)
 		    echo "$0: unknown long option ${opt}, or argument mismatch." >&2
@@ -71,17 +77,12 @@ while getopts :s:c:b:i:hC opt; do
 	    ;;
     esac
 
-
-    OPTARG="${OPTARG-none}"
-    OPTARG="$(escape "${OPTARG}")"
+    escape -v OPTARG "${OPTARG-none}"
 
     case "${opt}" in
 	--help|h)
 	    exec man notmuch-emacs-mua
 	    ;;
-	--client|C)
-	    USE_EMACSCLIENT="yes"
-	    ;;
 	--subject|s)
 	    ELISP="${ELISP} (message-goto-subject) (insert \"${OPTARG}\")"
 	    ;;
@@ -101,7 +102,14 @@ while getopts :s:c:b:i:hC opt; do
 	    PRINT_ONLY=1
 	    ;;
 	--no-window-system)
-	    CLIENT_TYPE="-t"
+	    NO_WINDOW="-nw"
+	    CREATE_FRAME=
+	    ;;
+	--client)
+	    USE_EMACSCLIENT="yes"
+	    ;;
+	--auto-daemon)
+	    AUTO_DAEMON="--alternate-editor="
 	    ;;
 	*)
 	    # We should never end up here.
@@ -116,7 +124,7 @@ done
 
 # Positional parameters.
 for arg; do
-    arg="$(escape "${arg}")"
+    escape -v arg "${arg}"
     ELISP="${ELISP} (message-goto-to) (insert \"${arg}, \")"
 done
 
@@ -130,7 +138,7 @@ fi
 
 if [ -n "$USE_EMACSCLIENT" ]; then
     # Evaluate the progn.
-    exec ${EMACSCLIENT} ${CLIENT_TYPE} -a '' --eval "${ELISP}"
+    exec ${EMACSCLIENT} ${NO_WINDOW} ${CREATE_FRAME} ${AUTO_DAEMON} --eval "${ELISP}"
 else
-    exec ${EMACS} --eval "${ELISP}"
+    exec ${EMACS} ${NO_WINDOW} --eval "${ELISP}"
 fi