X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-emacs-mua;h=b51d8d0e2c5be5000371e00337d9c9941322547b;hp=13f67bee4417f78569916e147e4610ffa39899c4;hb=b69201da5ddac5fc17935d39d8cca162716a6dd9;hpb=5240c438f5f6212fbce811ea4fd55ae964c97d99

diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua
index 13f67bee..b51d8d0e 100755
--- a/notmuch-emacs-mua
+++ b/notmuch-emacs-mua
@@ -22,21 +22,25 @@
 
 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=
 
 # 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))"
 
 # Short options compatible with mutt(1).
 while getopts :s:c:b:i:h opt; do
@@ -60,7 +64,7 @@ while getopts :s:c:b:i:h opt; do
 		    opt=${opt%%=*}
 		    ;;
 		# Long options without arguments.
-		--help|--print|--no-window-system|--client)
+		--help|--print|--no-window-system|--client|--auto-daemon|--create-frame)
 		    ;;
 		*)
 		    echo "$0: unknown long option ${opt}, or argument mismatch." >&2
@@ -72,17 +76,12 @@ while getopts :s:c:b:i:h 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)
-	    USE_EMACSCLIENT="yes"
-	    ;;
 	--subject|s)
 	    ELISP="${ELISP} (message-goto-subject) (insert \"${OPTARG}\")"
 	    ;;
@@ -102,7 +101,16 @@ while getopts :s:c:b:i:h opt; do
 	    PRINT_ONLY=1
 	    ;;
 	--no-window-system)
-	    CLIENT_TYPE="-t"
+	    NO_WINDOW="-nw"
+	    ;;
+	--client)
+	    USE_EMACSCLIENT="yes"
+	    ;;
+	--auto-daemon)
+	    AUTO_DAEMON="--alternate-editor="
+	    ;;
+	--create-frame)
+	    CREATE_FRAME="-c"
 	    ;;
 	*)
 	    # We should never end up here.
@@ -117,10 +125,15 @@ done
 
 # Positional parameters.
 for arg; do
-    arg="$(escape "${arg}")"
+    escape -v arg "${arg}"
     ELISP="${ELISP} (message-goto-to) (insert \"${arg}, \")"
 done
 
+# Kill the terminal/frame if we're creating one.
+if [ -z "$USE_EMACSCLIENT" -o -n "$CREATE_FRAME" -o -n "$NO_WINDOW" ]; then
+    ELISP="${ELISP} (setq message-exit-actions (list #'save-buffers-kill-terminal))"
+fi
+
 # End progn.
 ELISP="${ELISP})"
 
@@ -131,7 +144,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