From: Chris Koeritz Date: Tue, 19 May 2020 22:43:55 +0000 (-0400) Subject: unified EDITOR variable setup X-Git-Tag: 2.140.117^2~3 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=66abd1163765e482f9c11ec50210f44f2d2f06e9;p=feisty_meow.git unified EDITOR variable setup also stopped trying to use bluefish for the editor. yow. --- 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 ############## diff --git a/scripts/customize/fred/fred_variables.sh b/scripts/customize/fred/fred_variables.sh index 36bee1e1..00f9637b 100644 --- a/scripts/customize/fred/fred_variables.sh +++ b/scripts/customize/fred/fred_variables.sh @@ -38,31 +38,9 @@ if [ -z "$USER_CUSTOMIZATIONS_LOADED" ]; then # set our browser for seti and others that use the variable. # export BROWSER=/usr/bin/firefox - # editor and other mixed settings... - 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)" - 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, - # so gvim and others launched to x window are not appropriate. - export GIT_EDITOR="$EDITOR" - export SVN_EDITOR="$EDITOR" - - # this hideous mess is necessitated by our not having found the source of the - # settings yet. we override a few colors that look bad on a dark background. + # this hideous mess is necessitated by our not having found the source of + # the "ls" color settings yet. we override a few colors that look bad on + # a dark background. export LS_COLORS='no=00:fi=00:di=01;37:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;35:*.rpm=00;33:*.deb=00;33:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.zip=00;35:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;35:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:' # options for the lame mp3 encoder.