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: add --auto-daemon option to start Emacs daemon as needed

Browse source 
Automatically starting Emacs in daemon mode if the Emacs server is not
running is a matter of preference better not hard coded in
notmuch-emacs-mua. Add an option to control the behaviour.
This commit is contained in:
Jani Nikula 2015-08-15 12:05:14 +03:00 committed by David Bremner
parent cb4e73b736
commit 17fcf24d8b
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,8 +37,13 @@ Supported options for **notmuch-emacs-mua** include
Even if a window system is available, use the current terminal. Even if a window system is available, use the current terminal.
``--client`` ``--client``
Use **emacsclient**, rather than **emacs**. This will start Use **emacsclient**, rather than **emacs**. For
an Emacs daemon process if necessary. **emacsclient** to work, you need an already running Emacs
with a server, or use ``--auto-daemon``.
``--auto-daemon``
Automatically start Emacs in daemon mode, if the Emacs server
is not running. Applicable with ``--client``.
``--print`` ``--print``
Output the resulting elisp to stdout instead of evaluating it. Output the resulting elisp to stdout instead of evaluating it.

8
notmuch-emacs-mua
View file

@ -36,6 +36,7 @@ EMACSCLIENT=${EMACSCLIENT-emacsclient}
PRINT_ONLY= PRINT_ONLY=
NO_WINDOW= NO_WINDOW=
USE_EMACSCLIENT= USE_EMACSCLIENT=
AUTO_DAEMON=
CREATE_FRAME="-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.
@ -64,7 +65,7 @@ while getopts :s:c:b:i:h opt; do
opt=${opt%%=*} opt=${opt%%=*}
;; ;;
# Long options without arguments. # Long options without arguments.
--help|--print|--no-window-system|--client) --help|--print|--no-window-system|--client|--auto-daemon)
;; ;;
*) *)
echo "$0: unknown long option ${opt}, or argument mismatch." >&2 echo "$0: unknown long option ${opt}, or argument mismatch." >&2
@ -107,6 +108,9 @@ while getopts :s:c:b:i:h opt; do
--client) --client)
USE_EMACSCLIENT="yes" USE_EMACSCLIENT="yes"
;; ;;
--auto-daemon)
AUTO_DAEMON="--alternate-editor="
;;
*) *)
# We should never end up here. # We should never end up here.
echo "$0: internal error (option ${opt})." >&2 echo "$0: internal error (option ${opt})." >&2
@ -134,7 +138,7 @@ fi
if [ -n "$USE_EMACSCLIENT" ]; then if [ -n "$USE_EMACSCLIENT" ]; then
# Evaluate the progn. # Evaluate the progn.
exec ${EMACSCLIENT} ${NO_WINDOW} ${CREATE_FRAME} -a '' --eval "${ELISP}" exec ${EMACSCLIENT} ${NO_WINDOW} ${CREATE_FRAME} ${AUTO_DAEMON} --eval "${ELISP}"
else else
exec ${EMACS} ${NO_WINDOW} --eval "${ELISP}" exec ${EMACS} ${NO_WINDOW} --eval "${ELISP}"
fi fi