Merge branch 'initial-rework' of https://github.com/adamlsd/cshenv into initial-rework

This commit is contained in:
ADAM David Alan Martin
2014-02-02 17:25:11 -05:00
5 changed files with 49 additions and 8 deletions

View File

@ -39,6 +39,15 @@ if( -c `tty` ) then
if( $?CSHENV_DEBUG ) then if( $?CSHENV_DEBUG ) then
echo "Going to source core tcshrc..." echo "Going to source core tcshrc..."
endif endif
# Capture the original path, so that we don't
# keep infinitely expanding it.
if( $?CSHENV_ORIGINAL_PATH ) then
setenv PATH ${CSHENV_ORIGINAL_PATH}
else
setenv CSHENV_ORIGINAL_PATH ${PATH}
endif
source ${CSHENV_DIR}/tcshrc source ${CSHENV_DIR}/tcshrc
endif endif

19
tcshrc
View File

@ -1,4 +1,8 @@
# CSHRC Debugging tests #########################################
# CSHENV Environment, core loading file #
#########################################
# CSHENV Debugging tests
if( ( $?CSHENV_DEBUG ) || ( $?CSHENV_VERBOSE_STARTUP ) ) then if( ( $?CSHENV_DEBUG ) || ( $?CSHENV_VERBOSE_STARTUP ) ) then
echo "Currently running tcshrc script" echo "Currently running tcshrc script"
endif endif
@ -26,14 +30,20 @@ if( $?tcsh ) then
else else
# As we develop support for C++sh, we'll need this # As we develop support for C++sh, we'll need this
if( !$?cxxsh ) then if( !$?cxxsh ) then
echo "What! We're not even in tcsh or something compatible, like C++sh!!!" echo "What! We're not even in TCSH or something compatible, like C++sh!!!"
endif endif
endif endif
set cur_feature=$tcsh_features:e set cur_feature=$tcsh_features:e
# TCSH Extended features configuration
set color
set noding
set padhour
if( $?CSHENV_DEBUG ) then if( $?CSHENV_DEBUG ) then
echo "Tcsh Featureset probed..." echo "TCSH Featureset probed..."
endif endif
@ -49,7 +59,7 @@ source \!:1 \\
endif"' endif"'
if( $?CSHENV_DEBUG ) then if( $?CSHENV_DEBUG ) then
echo "Tcsh safe-source alias constructed..." echo "TCSH safe-source alias constructed..."
endif endif
@ -78,7 +88,6 @@ endif
#For FreeBSD's ls(1), and derived utilities {Like MacOS X/Darwin's ls(1)} #For FreeBSD's ls(1), and derived utilities {Like MacOS X/Darwin's ls(1)}
setenv LSCOLORS 'ExFxcxdxbxegedabagacEB' setenv LSCOLORS 'ExFxcxdxbxegedabagacEB'
setenv CLICOLOR_FORCE setenv CLICOLOR_FORCE
set color
if( $?CSHENV_DEBUG ) then if( $?CSHENV_DEBUG ) then
echo "Trying to source tcshrc.${CSHENV_SYSTEM}" echo "Trying to source tcshrc.${CSHENV_SYSTEM}"

View File

@ -1,6 +1,6 @@
# CSHENV Aliases: # CSHENV Aliases:
alias resource source ${CSHENV_DIR}/tcshrc alias resource source ${CSHENV_DIR}/startup_hooks/tcshrc
alias relog resource alias relog resource
alias rl relog alias rl relog
@ -28,7 +28,7 @@ if( $?CSHENV_USE_GNU_LS ) then
setenv CSHENV_SYSTEM_LS Linux setenv CSHENV_SYSTEM_LS Linux
else else
setenv CSHENV_SYSTEM_LS $SYSTEM setenv CSHENV_SYSTEM_LS $CSHENV_SYSTEM
endif endif
if( $?CSHENV_DEBUG ) then if( $?CSHENV_DEBUG ) then
echo "Done with gls probe..." echo "Done with gls probe..."

View File

@ -85,7 +85,7 @@ set n="1"
if ( ! -d $CSHENV_CACHE_DIR ) then if ( ! -d $CSHENV_CACHE_DIR ) then
mkdir $CSHENVTCSH_CACHE_DIR mkdir $CSHENV_CACHE_DIR
endif endif
#echo $screen_offset_count #echo $screen_offset_count
if ( -f ${CSHENV_CACHE_DIR}/screen.$screen_width ) then if ( -f ${CSHENV_CACHE_DIR}/screen.$screen_width ) then

23
vim/after/syntax/c.vim Normal file
View File

@ -0,0 +1,23 @@
" ADAM C vim syntax after extensions
syn match cNamedConstant "\<[A-Z_][A-Z_0-9]*\>"
syn match cDebug "\<DEBUG[_0-9A-Z]*\>"
syn keyword cDebug SKIP DOIT
" Define the default highlighting.
" For version 5.7 and earlier: only when not done already
" For version 5.8 and later: only when an item doesn't have highlighting yet
if version >= 508 || !exists("did_c_syn_inits")
if version < 508
let did_c_syn_inits = 1
command -nargs=+ HiLink hi link <args>
else
command -nargs=+ HiLink hi def link <args>
endif
HiLink cNamedConstant NamedConstant
HiLink cDebug Debug
delcommand HiLink
endif