Merge branch 'release-2.140.101'

[feisty_meow.git] / scripts / customize / fred / fred_variables.sh

diff --git a/scripts/customize/fred/fred_variables.sh b/scripts/customize/fred/fred_variables.sh
index 02e107a58d79c4c83008e424c4bac61dbdb7518c..87d0dbf2d3df5ba2685ddeedafc8016e4404a01e 100644 (file)
--- a/scripts/customize/fred/fred_variables.sh
+++ b/scripts/customize/fred/fred_variables.sh
@@ -18,7 +18,9 @@ if [ -z "$USER_CUSTOMIZATIONS_LOADED" ]; then
   REPOSITORY_LIST+=" cloud ebooks web "
 
   # adds our locally relevant archive folders into the list to be synched.
-  ARCHIVE_COLLECTIONS_LIST+="/z/basement /z/imaginations /z/musix /z/toaster /z/walrus"
+  MAJOR_ARCHIVE_SOURCES+="/z/archons /z/basement /z/imaginations /z/musix /z/toaster /z/walrus"
+  # our set of known source hierarchy folder names.
+  SOURCECODE_HIERARCHY_LIST="codebarn extra_brain interbrane"
 
   # point to our local certificate for ssh usage.
   export SVN_SSH="ssh -i $HOME/.ssh/id_dsa_sourceforge"
@@ -38,15 +40,21 @@ if [ -z "$USER_CUSTOMIZATIONS_LOADED" ]; then
 #  export BROWSER=/usr/bin/firefox
 
   # editor and other mixed settings...
-  export EDITOR="$(which vim)"
+  export EDITOR="$(which gvim)"
+  if [ -z "$EDITOR" ]; then
+    export EDITOR="$(which vim)"
+  else
+    # special case for gvim; tell it not to fork or we can't wait for it.
+    EDITOR+=" --nofork"
+  fi
   if [ -z "$EDITOR" ]; then
     EDITOR="$(which vi)"
-    if [ -z "$EDITOR" ]; then
-      EDITOR="$(which emacs)"
-      if [ -z "$EDITOR" ]; then
-        echo "Cannot find a friendly editor."
-      fi
-    fi
+  fi
+  if [ -z "$EDITOR" ]; then
+    EDITOR="$(which emacs)"
+  fi
+  if [ -z "$EDITOR" ]; then
+    echo "Cannot find a friendly editor."
   fi
   export VISUAL="$EDITOR"
   # the editors for revision control must wait while document is edited,