unify wrapping for normal and reflowed text

[etc/mutt.git] / .mutt / edit-header

diff --git a/.mutt/edit-header b/.mutt/edit-header
index c87717acfaec0f889377086982e2fa518635777c..ab7444bb5eb7b68f98666dd381c0434d7877fb22 100755 (executable)
--- a/.mutt/edit-header
+++ b/.mutt/edit-header
@@ -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,9 +64,12 @@ case "$0" in
 
 esac
 
-echo "set my_editor=\"\$editor\'"
-echo "set editor=\"$editor\""
-#echo "push <tag-prefix>"
-echo "push <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 "'"