notmuch-emacs-mua: move --client option handling around

[notmuch] / notmuch-emacs-mua

diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua
index 79714305b3e2a0a6104b84215710004efc157fe0..1f088c42feb90d16e5933083789819aac3edf794 100755 (executable)
--- a/notmuch-emacs-mua
+++ b/notmuch-emacs-mua
@@ -34,8 +34,9 @@ EMACS=${EMACS-emacs}
 EMACSCLIENT=${EMACSCLIENT-emacsclient}
 
 PRINT_ONLY=
+NO_WINDOW=
 USE_EMACSCLIENT=
-CLIENT_TYPE="-c"
+CREATE_FRAME="-c"
 
 # The crux of it all: construct an elisp progn and eval it.
 ELISP="(prog1 'done (require 'notmuch) (notmuch-mua-new-mail)"
@@ -81,9 +82,6 @@ while getopts :s:c:b:i:h opt; do
        --help|h)
            exec man notmuch-emacs-mua
            ;;
-       --client)
-           USE_EMACSCLIENT="yes"
-           ;;
        --subject|s)
            ELISP="${ELISP} (message-goto-subject) (insert \"${OPTARG}\")"
            ;;
@@ -103,7 +101,11 @@ while getopts :s:c:b:i:h opt; do
            PRINT_ONLY=1
            ;;
        --no-window-system)
-           CLIENT_TYPE="-t"
+           NO_WINDOW="-nw"
+           CREATE_FRAME=
+           ;;
+       --client)
+           USE_EMACSCLIENT="yes"
            ;;
        *)
            # We should never end up here.
@@ -132,7 +134,7 @@ fi
 
 if [ -n "$USE_EMACSCLIENT" ]; then
     # Evaluate the progn.
-    exec ${EMACSCLIENT} ${CLIENT_TYPE} -a '' --eval "${ELISP}"
+    exec ${EMACSCLIENT} ${NO_WINDOW} ${CREATE_FRAME} -a '' --eval "${ELISP}"
 else
-    exec ${EMACS} --eval "${ELISP}"
+    exec ${EMACS} ${NO_WINDOW} --eval "${ELISP}"
 fi