X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=d8b44bc845aeaa7b2451473caabcb822bc1e83bb;hp=3596c0c4f5ae4141c832487dea8019dde4ba868b;hb=66abd1163765e482f9c11ec50210f44f2d2f06e9;hpb=24f5c6684f56de6e24c74edb4d34ce00a74213b5

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 3596c0c4..d8b44bc8 100644
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -318,12 +318,10 @@ done
 # a late breaking action is to set the editor, if we can.
 # we will fallback to whatever we can find on the host.
 export EDITOR
-if [ ! -z "$DISPLAY" ]; then
-  # only try to add bluefish, a gui editor, if there is an X display for it.
-  if [ -z "$EDITOR" ]; then
-    EDITOR="$(which bluefish)"
-  fi
-fi
+# note: the editors for revision control must wait while the document is
+# edited, so gvim and others that launch a separate x window are not
+# going to work well unless they can be prevented from forking the process
+# off.
 if [ -z "$EDITOR" ]; then
   EDITOR="$(which gvim)"
   if [ ! -z "$EDITOR" ]; then
@@ -337,12 +335,18 @@ fi
 if [ -z "$EDITOR" ]; then
   EDITOR="$(which vi)"
 fi
-##
+if [ -z "$EDITOR" ]; then
+  EDITOR="$(which emacs)"
+fi
+####
 # out of ideas about editors at this point.
-##
-# set the VISUAL variable from EDITOR if we found an editor to use.
+####
+# set the VISUAL and other variables from EDITOR if we found an editor to use.
 if [ ! -z "$EDITOR" ]; then
   VISUAL="$EDITOR"
+
+  export GIT_EDITOR="$EDITOR"
+  export SVN_EDITOR="$EDITOR"
 fi
 
 ##############