debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Make the default behaviour for --client the same as emacsclient
default: do not create a new frame. Add a new option --create-frame,
passing the same option to emacsclient to create a frame.
This commit is contained in:
Jani Nikula 2015-08-15 12:05:15 +03:00 committed by David Bremner
parent 17fcf24d8b
commit b69201da5d
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/man1/notmuch-emacs-mua.rst
View file

@ -45,6 +45,12 @@ Supported options for **notmuch-emacs-mua** include
Automatically start Emacs in daemon mode, if the Emacs server
is not running. Applicable with ``--client``.
``--create-frame``
Create a new frame instead of trying to use the current Emacs
frame. Applicable with ``--client``. This will be required
when Emacs is running (or automatically started with
``--auto-daemon``) in daemon mode.
``--print``
Output the resulting elisp to stdout instead of evaluating it.

14
notmuch-emacs-mua
View file

@ -37,11 +37,10 @@ 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,7 +102,6 @@ while getopts :s:c:b:i:h opt; do
;;
--no-window-system)
NO_WINDOW="-nw"
CREATE_FRAME=
;;
--client)
USE_EMACSCLIENT="yes"
@ -111,6 +109,9 @@ while getopts :s:c:b:i:h opt; do
--auto-daemon)
AUTO_DAEMON="--alternate-editor="
;;
--create-frame)
CREATE_FRAME="-c"
;;
*)
# We should never end up here.
echo "$0: internal error (option ${opt})." >&2
@ -128,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})"