aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Nikula <jani@nikula.org>2015-08-15 12:05:12 +0300
committerDavid Bremner <david@tethera.net>2015-09-29 08:25:25 -0300
commit0aa74d3241687ff70819981bbecad96b204886e7 (patch)
tree8074b650e42e7b48bd146b7e59394d09c3d74149
parentac609e5a3b8d2f528cc65fd4661e25e5140a7baf (diff)
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.
-rwxr-xr-xnotmuch-emacs-mua10
1 files changed, 6 insertions, 4 deletions
diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua
index 79714305..e33aa955 100755
--- 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)"
@@ -103,7 +104,8 @@ while getopts :s:c:b:i:h opt; do
PRINT_ONLY=1
;;
--no-window-system)
- CLIENT_TYPE="-t"
+ NO_WINDOW="-nw"
+ CREATE_FRAME=
;;
*)
# 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