Mutt: Don't set editor to emc, use VISUAL with more convenient emw

.config/mutt/maileditor.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-## Seems like $EDITOR is internal to Mutt, whereas variable set between
-## backquotes are external. By default Mutt will use env EDITOR variable, so we
-## do not really need to set it.
-# set editor=`echo \$EDITOR`
-## If graphical emacs is used, we need to use a non-terminating client.
-
-if [ "$EDITOR" = "em" ]; then
-	cat <<EOF
-set editor="emc"
-EOF
-fi

.config/mutt/muttrc

@@ -27,9 +27,6 @@ set pgp_timeout=3600
 ## Headers are editable in editor.
 set edit_headers=yes
 
-## Set EDITOR dynamically.
-source "$my_configdir/maileditor.sh|"
-
 ## Don't ask for recipient. We usually don't want to include mail unless we want
 ## to quote it.
 set fast_reply=yes

.profile

@@ -185,7 +185,9 @@ prependpath "${HOME}/personal/hackpool"
 
 ## Default text editor
 ## 'em' is a custom wrapper for emacsclient. See '.scripts/em'.
-for i in em emacs vim nano; do
+## VISUAL is given priority by some programs like Mutt. This way we can separate
+## editors that wait from those that don't.
+for i in em emacs vim vi nano; do
 	command -v $i >/dev/null 2>&1 && export EDITOR=$i && break
 done
 GIT_EDITOR="$EDITOR"