From 958ac6df11cd534d72b9c7cd462cd702a875d3cf Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Sat, 28 Aug 2010 18:31:54 +0000
Subject: [PATCH] -Set default editor to "nano". When emacs is installed, this
 will be changed to "emacs".

---
 functions        | 2 ++
 stage5/cis-emacs | 3 +++
 sysinfos         | 2 --
 sysinfos.server  | 2 --
 sysinfos.workstn | 2 --
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/functions b/functions
index 1107738..2227332 100644
--- a/functions
+++ b/functions
@@ -24,6 +24,8 @@ TAR_OPTS="-b8"
 
 HV_FONTS_PATH="/usr/share/fonts"
 
+DEFAULT_EDITOR=nano
+
 # It seems that when compiling bash-4.0, using
 # "make -j 1" is causing problems...
 if [ "x${MAKEJOBS}" = "x1" ]; then
diff --git a/stage5/cis-emacs b/stage5/cis-emacs
index c008cc5..65038df 100755
--- a/stage5/cis-emacs
+++ b/stage5/cis-emacs
@@ -28,4 +28,7 @@ LOCAL_SITE_LIST=/usr/local/share/emacs/site-lisp
 install -v -m644 -d ${LOCAL_SITE_LIST}
 install -m644 ${SCRDIR}/resources/emacs/buffer-cycle.el ${LOCAL_SITE_LIST}
 
+# Set Emacs as default editor
+sed -i -e "s!^\(EDITOR=\).*!\1emacs!" /etc/profile
+
 exit $?
diff --git a/sysinfos b/sysinfos
index 0d752cd..6c2cee6 100644
--- a/sysinfos
+++ b/sysinfos
@@ -38,8 +38,6 @@ HVL_TARGET="x86_64"
 # Used for setting '-march=xxx' option in CFLAGS and CPPFLAGS
 MACHINE_ARCHITECTURE=""
 
-DEFAULT_EDITOR="emacs"
-
 # Keyboard mapping (example: us)
 KEYBOARD="us"
 
diff --git a/sysinfos.server b/sysinfos.server
index 569fa9d..5b7c321 100644
--- a/sysinfos.server
+++ b/sysinfos.server
@@ -29,8 +29,6 @@ SWAP_PARTITION="/dev/hda5"
 # Used for setting '-march=xxx' option in CFLAGS and CPPFLAGS
 MACHINE_ARCHITECTURE="pentium"
 
-DEFAULT_EDITOR="emacs"
-
 # Keyboard mapping (example: us)
 KEYBOARD="us"
 
diff --git a/sysinfos.workstn b/sysinfos.workstn
index 89e00c0..f04704b 100644
--- a/sysinfos.workstn
+++ b/sysinfos.workstn
@@ -29,8 +29,6 @@ SWAP_PARTITION="/dev/hda5"
 # Used for setting '-march=xxx' option in CFLAGS and CPPFLAGS
 MACHINE_ARCHITECTURE="pentium"
 
-DEFAULT_EDITOR="emacs"
-
 # Keyboard mapping (example: us)
 KEYBOARD="us"
 
-- 
2.20.1