notmuch-emacs-mua: do not create a frame by default with --client

[notmuch] / notmuch-emacs-mua

diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua
index 1f088c42feb90d16e5933083789819aac3edf794..b51d8d0e2c5be5000371e00337d9c9941322547b 100755 (executable)
--- a/notmuch-emacs-mua
+++ b/notmuch-emacs-mua
@@ -36,11 +36,11 @@ EMACSCLIENT=${EMACSCLIENT-emacsclient}
 PRINT_ONLY=
 NO_WINDOW=
 USE_EMACSCLIENT=
-CREATE_FRAME="-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
@@ -64,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
@@ -102,11 +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)
+           CREATE_FRAME="-c"
+           ;;
        *)
            # We should never end up here.
            echo "$0: internal error (option ${opt})." >&2
@@ -124,6 +129,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})"
 
@@ -134,7 +144,7 @@ fi
 
 if [ -n "$USE_EMACSCLIENT" ]; then
     # Evaluate the progn.
-    exec ${EMACSCLIENT} ${NO_WINDOW} ${CREATE_FRAME} -a '' --eval "${ELISP}"
+    exec ${EMACSCLIENT} ${NO_WINDOW} ${CREATE_FRAME} ${AUTO_DAEMON} --eval "${ELISP}"
 else
     exec ${EMACS} ${NO_WINDOW} --eval "${ELISP}"
 fi