X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/d215fb8c4bb24685149e374ced9ab2fa5c2fd21e..f8a734295c2a23119575dc17bdce157d01fbbacb:/.mutt/batch-subject-editor

diff --git a/.mutt/batch-subject-editor b/.mutt/batch-subject-editor
index ad12bef..0649ac5 100755
--- a/.mutt/batch-subject-editor
+++ b/.mutt/batch-subject-editor
@@ -9,6 +9,10 @@
 #
 set -eu
 
+if [ -z "${__RLWRAPPED:-}" ] && [ -x $(command -v rlwrap) ]; then
+  __RLWRAPPED=true exec rlwrap "$0" "$@"
+fi
+
 printf 'Enter new subject: ' >/dev/tty
 read subj </dev/tty
 
@@ -17,9 +21,12 @@ if [ -z "${subj:-}" ]; then
   exit 1
 fi
 
-RE_REPLY='(re([[(]?[[:digit:]]+[)]]?)?|aw|antwort):[[:space:]]*'
-RE_SUBJ_PREFIX="^Subject:[[:space:]]*(${RE_REPLY})?"
+SED_DELIM=,
+subj=$(echo "$subj" | sed -re "s${SED_DELIM}\\\&g")
+
+RE_REPLY='((re|aw|antwort)([[(]?[[:digit:]]+[)]]?)?):[[:space:]]*'
+RE_SUBJ_PREFIX="^Subject:[[:space:]]*(${RE_REPLY})*"
 RE_SUBJ='.*'
-EDITOR="sed -i -re \"s,(${RE_SUBJ_PREFIX})${RE_SUBJ},\\\1$subj,i\""
+EDITOR="sed -i -re \"s${SED_DELIM}(${RE_SUBJ_PREFIX})${RE_SUBJ}${SED_DELIM}\\\1$subj${SED_DELIM}i\""
 
-printf "set editor='${EDITOR} %s'\n"
+printf "set editor='${EDITOR} %s'"