From 00c3c1f3b1221e5dc2d57b53daef7eb1b0f09858 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 18 Aug 2016 11:09:47 +1200
Subject: Arrange EDITOR/VISUAL in a more typical way

---
 bin/eds                | 4 ++--
 bin/td                 | 4 ++--
 sh/profile.d/editor.sh | 7 +++----
 sh/profile.d/visual.sh | 3 +++
 4 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 sh/profile.d/visual.sh

diff --git a/bin/eds b/bin/eds
index 1855fb34..2afd0a07 100755
--- a/bin/eds
+++ b/bin/eds
@@ -43,8 +43,8 @@ for file in "${files[@]}" ; do
     creations[${#creations[@]}]=$file
 done
 
-# Run the editor; if EDITOR isn't set, use vi(1)
-"${EDITOR:-vi}" "${opts[@]}" -- "${files[@]}"
+# Run the editor; if EDITOR isn't set, use ed(1)
+"${VISUAL:-"${EDITOR:-ed}"}" "${opts[@]}" -- "${files[@]}"
 
 # Make any created scripts executable if they now appear to be files
 for creation in "${creations[@]}" ; do
diff --git a/bin/td b/bin/td
index e6cbfd93..5088f572 100755
--- a/bin/td
+++ b/bin/td
@@ -21,8 +21,8 @@ isgr || git init || exit
 # If the to-do file doesn't exist yet, create it
 [ -e "$file" ] || touch -- "$file" || exit
 
-# Launch $VISUAL (or $EDITOR (or vi(1))) to edit the appropriate to-do file
-"${VISUAL:-"${EDITOR:-vi}"}" "$file"
+# Launch an appropriate editor to edit that file
+"${VISUAL:-"${EDITOR:-ed}"}" "$file"
 
 # Add the file to the changeset
 git add -- "$file"
diff --git a/sh/profile.d/editor.sh b/sh/profile.d/editor.sh
index 7ed9e262..ee0da70b 100644
--- a/sh/profile.d/editor.sh
+++ b/sh/profile.d/editor.sh
@@ -1,4 +1,3 @@
-# Set editor
-EDITOR=vi
-VISUAL=$EDITOR
-export EDITOR VISUAL
+# Set command-line editor
+EDITOR=ed
+export EDITOR
diff --git a/sh/profile.d/visual.sh b/sh/profile.d/visual.sh
new file mode 100644
index 00000000..95eb1d5d
--- /dev/null
+++ b/sh/profile.d/visual.sh
@@ -0,0 +1,3 @@
+# Set visual editor
+VISUAL=vi
+export VISUAL
-- 
cgit v1.2.3