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 b51d8d0e2c5be5000371e00337d9c9941322547b..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,8 +30,8 @@ escape ()
     printf -v $2 '%s' "${__escape_arg__//\"/\\\"}"
 }
 
-EMACS=${EMACS-emacs}
-EMACSCLIENT=${EMACSCLIENT-emacsclient}
+EMACS=${EMACS:-emacs}
+EMACSCLIENT=${EMACSCLIENT:-emacsclient}
 
 PRINT_ONLY=
 NO_WINDOW=
@@ -39,8 +39,10 @@ USE_EMACSCLIENT=
 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="(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
@@ -95,7 +97,7 @@ 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
@@ -108,6 +110,7 @@ while getopts :s:c:b:i:h opt; do
            ;;
        --auto-daemon)
            AUTO_DAEMON="--alternate-editor="
+           CREATE_FRAME="-c"
            ;;
        --create-frame)
            CREATE_FRAME="-c"
@@ -131,7 +134,7 @@ 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))"
+    ELISP="${ELISP} (message-add-action #'save-buffers-kill-terminal 'exit)"
 fi
 
 # End progn.