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

diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua
index ac03a4a6..4404cd7c 100755
--- a/notmuch-emacs-mua
+++ b/notmuch-emacs-mua
@@ -30,18 +30,17 @@ escape ()
     printf -v $2 '%s' "${__escape_arg__//\"/\\\"}"
 }
 
-EMACS=${EMACS-emacs}
-EMACSCLIENT=${EMACSCLIENT-emacsclient}
+EMACS=${EMACS:-emacs}
+EMACSCLIENT=${EMACSCLIENT:-emacsclient}
 
 PRINT_ONLY=
 NO_WINDOW=
 USE_EMACSCLIENT=
 AUTO_DAEMON=
-CREATE_FRAME="-c"
+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
@@ -65,7 +64,7 @@ while getopts :s:c:b:i:h opt; do
 		    opt=${opt%%=*}
 		    ;;
 		# Long options without arguments.
-		--help|--print|--no-window-system|--client|--auto-daemon)
+		--help|--print|--no-window-system|--client|--auto-daemon|--create-frame)
 		    ;;
 		*)
 		    echo "$0: unknown long option ${opt}, or argument mismatch." >&2
@@ -103,13 +102,16 @@ while getopts :s:c:b:i:h opt; do
 	    ;;
 	--no-window-system)
 	    NO_WINDOW="-nw"
-	    CREATE_FRAME=
 	    ;;
 	--client)
 	    USE_EMACSCLIENT="yes"
 	    ;;
 	--auto-daemon)
 	    AUTO_DAEMON="--alternate-editor="
+	    CREATE_FRAME="-c"
+	    ;;
+	--create-frame)
+	    CREATE_FRAME="-c"
 	    ;;
 	*)
 	    # We should never end up here.
@@ -128,6 +130,11 @@ for arg; do
     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})"