From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Cc: Tomi Ollila <tomi.ollila@iki.fi>
Subject: [PATCH v4 5/5] notmuch-emacs-mua: do not create a frame by default with --client
Date: Sat, 15 Aug 2015 12:05:15 +0300 [thread overview]
Message-ID: <455026447d3f75b1038ac11cebe734431604be9d.1439629384.git.jani@nikula.org> (raw)
In-Reply-To: <cover.1439629384.git.jani@nikula.org>
In-Reply-To: <cover.1439629384.git.jani@nikula.org>
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.
---
v2: fix killing frame with --create-frame
v3: fix --create-frame w/o --client parameter check
v4: fix kill terminal logic, document behaviour with daemon mode
---
doc/man1/notmuch-emacs-mua.rst | 6 ++++++
notmuch-emacs-mua | 14 ++++++++++----
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst
index 89a2fead17b1..c3689eb82c8a 100644
--- a/doc/man1/notmuch-emacs-mua.rst
+++ b/doc/man1/notmuch-emacs-mua.rst
@@ -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.
diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua
index ac03a4a60d56..b51d8d0e2c5b 100755
--- a/notmuch-emacs-mua
+++ b/notmuch-emacs-mua
@@ -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})"
--
2.1.4
next prev parent reply other threads:[~2015-08-15 9:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-15 9:05 [PATCH v4 0/5] notmuch-emacs-mua updates Jani Nikula
2015-08-15 9:05 ` [PATCH v4 1/5] man: clean up notmuch-emacs-mua man page Jani Nikula
2015-08-15 9:05 ` [PATCH v4 2/5] notmuch-emacs-mua: support --no-window-system also for non-client Jani Nikula
2015-08-15 9:05 ` [PATCH v4 3/5] notmuch-emacs-mua: move --client option handling around Jani Nikula
2015-08-15 9:05 ` [PATCH v4 4/5] notmuch-emacs-mua: add --auto-daemon option to start Emacs daemon as needed Jani Nikula
2015-08-15 9:05 ` Jani Nikula [this message]
2015-08-26 19:03 ` [PATCH v4 5/5] notmuch-emacs-mua: do not create a frame by default with --client Tomi Ollila
2015-08-28 18:22 ` Jani Nikula
2015-08-28 19:18 ` Tomi Ollila
2015-09-28 10:59 ` David Bremner
2015-09-29 19:18 ` Tomi Ollila
2015-09-30 6:13 ` Tomi Ollila
2015-09-29 11:28 ` [PATCH v4 0/5] notmuch-emacs-mua updates David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=455026447d3f75b1038ac11cebe734431604be9d.1439629384.git.jani@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
--cc=tomi.ollila@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).