X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/616f061f77605ce342e3068e5aacda3dffa24710..3031cacf7cdae16c8ac58ca399675b22ab3ea0d9:/.mutt/edit-header

diff --git a/.mutt/edit-header b/.mutt/edit-header
index 3a3a96a..ab7444b 100755
--- a/.mutt/edit-header
+++ b/.mutt/edit-header
@@ -7,7 +7,7 @@
 # Copyright © 2008 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #
-set -euvx
+set -eu
 
 if [ ! -x "$(command -v formail)" ]; then
   echo E: formail not installed. >&2
@@ -30,6 +30,10 @@ get_header_contents()
 
 script="${0%/*}/${2:-}"
 if [ -f "$script" ] && [ -x "$script" ]; then
+  if [ -z "${__RLWRAPPED:-}" ] && [ -x $(command -v rlwrap) ]; then
+    __RLWRAPPED=true exec rlwrap "$0" "$@"
+  fi
+
   contents_source="$script"
   shift
 else
@@ -60,8 +64,12 @@ case "$0" in
 
 esac
 
-echo "set my_editor=\"\$editor\'"
-echo "set editor=\"$editor\""
-echo "push <tag-prefix><edit>"
-# we need to push this so it happens after the editing
-echo "push :set editor=\"\$my_editor\"<enter>"
+echo "set my_editor=\"\$editor\""
+echo "set my_filter=\"$editor\""
+echo -n "push '"
+echo -n "<enter-command>set editor=\"\$my_filter\"<enter>"
+echo -n "<edit>"
+echo -n "<enter-command>set editor=\"\$my_editor\"<enter>"
+echo -n "<enter-command>unset my_filter<enter>"
+echo -n "<enter-command>unset my_editor<enter>"
+echo "'"