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).

diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst
index c3689eb82c8af4324ae0cfd0f60f49084161845e..7c5729047173815a08bb2ce0c10754120a528db3 100644 (file)
--- 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 b51d8d0e2c5be5000371e00337d9c9941322547b..016fa12613c49c217b11fa8959c55a1e50a8e40f 100755 (executable)
--- 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"