emacs: tree: make tag updates show in the message pane

[notmuch] / notmuch-emacs-mua

diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua
index e33aa955d6b559faf7e618a14b27717a9dd5928c..f9d83713b78958093e1fdd731596271ab3af3be4 100755 (executable)
--- a/notmuch-emacs-mua
+++ b/notmuch-emacs-mua
@@ -15,7 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see http://www.gnu.org/licenses/ .
+# along with this program.  If not, see https://www.gnu.org/licenses/ .
 #
 # Authors: Jani Nikula <jani@nikula.org>
 #
@@ -30,17 +30,19 @@ escape ()
     printf -v $2 '%s' "${__escape_arg__//\"/\\\"}"
 }
 
-EMACS=${EMACS-emacs}
-EMACSCLIENT=${EMACSCLIENT-emacsclient}
+EMACS=${EMACS:-emacs}
+EMACSCLIENT=${EMACSCLIENT:-emacsclient}
 
 PRINT_ONLY=
 NO_WINDOW=
 USE_EMACSCLIENT=
-CREATE_FRAME="-c"
+AUTO_DAEMON=
+CREATE_FRAME=
+
+escape -v pwd "$PWD"
 
 # 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))"
+ELISP="(prog1 'done (require 'notmuch) (cd \"$pwd\") (notmuch-mua-new-mail)"
 
 # Short options compatible with mutt(1).
 while getopts :s:c:b:i:h opt; do
@@ -64,7 +66,7 @@ while getopts :s:c:b:i:h opt; do
                    opt=${opt%%=*}
                    ;;
                # Long options without arguments.
-               --help|--print|--no-window-system|--client)
+               --help|--print|--no-window-system|--client|--auto-daemon|--create-frame)
                    ;;
                *)
                    echo "$0: unknown long option ${opt}, or argument mismatch." >&2
@@ -82,9 +84,6 @@ while getopts :s:c:b:i:h opt; do
        --help|h)
            exec man notmuch-emacs-mua
            ;;
-       --client)
-           USE_EMACSCLIENT="yes"
-           ;;
        --subject|s)
            ELISP="${ELISP} (message-goto-subject) (insert \"${OPTARG}\")"
            ;;
@@ -98,14 +97,23 @@ while getopts :s:c:b:i:h opt; do
            ELISP="${ELISP} (message-goto-bcc) (insert \"${OPTARG}, \")"
            ;;
        --body|i)
-           ELISP="${ELISP} (message-goto-body) (cd \"${PWD}\") (insert-file \"${OPTARG}\")"
+           ELISP="${ELISP} (message-goto-body) (insert-file \"${OPTARG}\")"
            ;;
        --print)
            PRINT_ONLY=1
            ;;
        --no-window-system)
            NO_WINDOW="-nw"
-           CREATE_FRAME=
+           ;;
+       --client)
+           USE_EMACSCLIENT="yes"
+           ;;
+       --auto-daemon)
+           AUTO_DAEMON="--alternate-editor="
+           CREATE_FRAME="-c"
+           ;;
+       --create-frame)
+           CREATE_FRAME="-c"
            ;;
        *)
            # We should never end up here.
@@ -124,6 +132,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} (message-add-action #'save-buffers-kill-terminal 'exit)"
+fi
+
 # End progn.
 ELISP="${ELISP})"
 
@@ -134,7 +147,7 @@ fi
 
 if [ -n "$USE_EMACSCLIENT" ]; then
     # Evaluate the progn.
-    exec ${EMACSCLIENT} ${NO_WINDOW} ${CREATE_FRAME} -a '' --eval "${ELISP}"
+    exec ${EMACSCLIENT} ${NO_WINDOW} ${CREATE_FRAME} ${AUTO_DAEMON} --eval "${ELISP}"
 else
     exec ${EMACS} ${NO_WINDOW} --eval "${ELISP}"
 fi