Merge branch 'master' of gitosis@majnematic.com:davesdots

This commit is contained in:
David Majnemer 2010-11-15 19:24:56 -06:00
commit 887624bac2
5 changed files with 10 additions and 6 deletions

3
.gitignore vendored
View file

@ -1,4 +1,5 @@
*.swp *.swp
.DS_Store .DS_Store
.nfs.* .nfs.*
answerback answerback.Linux
answerback.Darwin

2
_vimrc Normal file
View file

@ -0,0 +1,2 @@
set runtimepath+=~\.vim
source ~\.vimrc

View file

@ -45,6 +45,7 @@ my %links = (
vim => '.vim', vim => '.vim',
vimrc => '.vimrc', vimrc => '.vimrc',
_vimrc => '_vimrc',
gvimrc => '.gvimrc', gvimrc => '.gvimrc',
commonsh => '.commonsh', commonsh => '.commonsh',

4
kshrc
View file

@ -1,11 +1,11 @@
if [ -d "${HOME}/.commonsh" ] ; then if [ -d "${HOME}/.commonsh" ] ; then
for file in "${HOME}"/.commonsh/* ; do for file in "${HOME}"/.commonsh/* ; do
. $file . "${file}"
done done
fi fi
if [ -d "${HOME}/.ksh" ] ; then if [ -d "${HOME}/.ksh" ] ; then
for file in "${HOME}"/.ksh/* ; do for file in "${HOME}"/.ksh/* ; do
. $file . "${file}"
done done
fi fi

6
vimrc
View file

@ -146,7 +146,7 @@ if has('eval')
elseif &t_Co == 88 elseif &t_Co == 88
call LoadColorScheme("wombat:zellner") call LoadColorScheme("wombat:zellner")
else else
call LoadColorScheme("darkblue:zellner") call LoadColorScheme("desert:darkblue:zellner")
endif endif
endif endif
@ -309,10 +309,10 @@ if has('eval')
endif endif
" w!! for sudo w! " w!! for sudo w!
cmap w!! w !sudo tee % >/dev/null "cmap w!! w !sudo tee % >/dev/null
" clear search " clear search
nnoremap <esc> :noh<return><esc> "nnoremap <esc> :noh<return><esc>
" Disable q and Q " Disable q and Q
map q <Nop> map q <Nop>