notmuch-emacs-mua: support --no-window-system also for non-client

Clearly --no-window-system should be applicable without --client as
well. Prepare for future changes with the naming of the variables.
This commit is contained in:
Jani Nikula 2015-08-15 12:05:12 +03:00 committed by David Bremner
parent ac609e5a3b
commit 0aa74d3241

View file

@ -34,8 +34,9 @@ EMACS=${EMACS-emacs}
EMACSCLIENT=${EMACSCLIENT-emacsclient} EMACSCLIENT=${EMACSCLIENT-emacsclient}
PRINT_ONLY= PRINT_ONLY=
NO_WINDOW=
USE_EMACSCLIENT= USE_EMACSCLIENT=
CLIENT_TYPE="-c" CREATE_FRAME="-c"
# The crux of it all: construct an elisp progn and eval it. # The crux of it all: construct an elisp progn and eval it.
ELISP="(prog1 'done (require 'notmuch) (notmuch-mua-new-mail)" ELISP="(prog1 'done (require 'notmuch) (notmuch-mua-new-mail)"
@ -103,7 +104,8 @@ while getopts :s:c:b:i:h opt; do
PRINT_ONLY=1 PRINT_ONLY=1
;; ;;
--no-window-system) --no-window-system)
CLIENT_TYPE="-t" NO_WINDOW="-nw"
CREATE_FRAME=
;; ;;
*) *)
# We should never end up here. # We should never end up here.
@ -132,7 +134,7 @@ fi
if [ -n "$USE_EMACSCLIENT" ]; then if [ -n "$USE_EMACSCLIENT" ]; then
# Evaluate the progn. # Evaluate the progn.
exec ${EMACSCLIENT} ${CLIENT_TYPE} -a '' --eval "${ELISP}" exec ${EMACSCLIENT} ${NO_WINDOW} ${CREATE_FRAME} -a '' --eval "${ELISP}"
else else
exec ${EMACS} --eval "${ELISP}" exec ${EMACS} ${NO_WINDOW} --eval "${ELISP}"
fi fi