aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomi Ollila <tomi.ollila@iki.fi>2015-09-30 09:36:52 +0300
committerDavid Bremner <david@tethera.net>2015-10-01 08:40:32 -0300
commit7b7dadb93f73840fc4eb3f93cb01901c41e97360 (patch)
treef71716109fde78c813d24951b068d32543478035
parentb69201da5ddac5fc17935d39d8cca162716a6dd9 (diff)
notmuch-emacs-mua: make --auto-daemon imply --create-frame
Before this change with --auto-daemon but without --create-frame emacs server was started but no clients stay connected to it (in both graphical and terminal displays). Note that this changes how --client --auto-daemon works on graphical display; New emacs frame is now created for the message (and message-exit-actions hook appended).
-rw-r--r--doc/man1/notmuch-emacs-mua.rst3
-rwxr-xr-xnotmuch-emacs-mua1
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst
index c3689eb8..7c572904 100644
--- a/doc/man1/notmuch-emacs-mua.rst
+++ b/doc/man1/notmuch-emacs-mua.rst
@@ -43,7 +43,8 @@ Supported options for **notmuch-emacs-mua** include
``--auto-daemon``
Automatically start Emacs in daemon mode, if the Emacs server
- is not running. Applicable with ``--client``.
+ is not running. Applicable with ``--client``. Implies
+ ``--create-frame``.
``--create-frame``
Create a new frame instead of trying to use the current Emacs
diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua
index b51d8d0e..016fa126 100755
--- a/notmuch-emacs-mua
+++ b/notmuch-emacs-mua
@@ -108,6 +108,7 @@ while getopts :s:c:b:i:h opt; do
;;
--auto-daemon)
AUTO_DAEMON="--alternate-editor="
+ CREATE_FRAME="-c"
;;
--create-frame)
CREATE_FRAME="-c"