# 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>
#
printf -v $2 '%s' "${__escape_arg__//\"/\\\"}"
}
-EMACS=${EMACS-emacs}
-EMACSCLIENT=${EMACSCLIENT-emacsclient}
+EMACS=${EMACS:-emacs}
+EMACSCLIENT=${EMACSCLIENT:-emacsclient}
PRINT_ONLY=
NO_WINDOW=
USE_EMACSCLIENT=
AUTO_DAEMON=
-CREATE_FRAME="-c"
+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
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
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.
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})"