naomi/dots
1
0
Fork 0
mirror of https://github.com/NaomiAmethyst/dots.git synced 2025-08-05 16:48:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of majnematic.com:davesdots

Browse source
This commit is contained in:
David Majnemer 2010-06-21 16:08:32 -07:00
commit e0ad045735
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
vimrc
View file

@ -109,7 +109,6 @@ endif
set laststatus=2 set laststatus=2
set shortmess=atI set shortmess=atI
if has('statusline') if has('statusline')
set statusline=Editing:\ %r%t%m\ %=Location:\ Line\ %l/%L\ \ Col:\ %c\ (%p%%)
set statusline=%<%F\ %r[%{&ff}]%y%m\ %=\ Line\ %l\/%L\ Col:\ %c\ (%P) set statusline=%<%F\ %r[%{&ff}]%y%m\ %=\ Line\ %l\/%L\ Col:\ %c\ (%P)
endif endif
@ -145,7 +144,7 @@ if has('eval')
elseif &t_Co == 88 elseif &t_Co == 88
call LoadColorScheme("wombat:zellner") call LoadColorScheme("wombat:zellner")
else else
call LoadColorScheme("zellner") call LoadColorScheme("darkblue:zellner")
endif endif
endif endif
@ -242,13 +241,15 @@ endif
" Append modeline after last line in buffer. " Append modeline after last line in buffer.
" Use substitute() (not printf()) to handle '%%s' modeline in LaTeX files. " Use substitute() (not printf()) to handle '%%s' modeline in LaTeX files.
function! AppendModeline() if has('eval')
let save_cursor = getpos('.') fun! AppendModeline()
let append = ' vim: set ts='.&tabstop.' sw='.&shiftwidth.' tw='.&textwidth.': ' let save_cursor = getpos('.')
$put =substitute(&commentstring, '%s', append, '') let append = ' vim: set ts='.&tabstop.' sw='.&shiftwidth.' tw='.&textwidth.': '
call setpos('.', save_cursor) $put =substitute(&commentstring, '%s', append, '')
endfunction call setpos('.', save_cursor)
nnoremap <silent> <Leader>ml :call AppendModeline()<CR> endfun
nnoremap <silent> <Leader>ml :call AppendModeline()<CR>
endif
" tab indents selection " tab indents selection
vmap <silent> <Tab> >gv vmap <silent> <Tab> >gv
@ -283,14 +284,16 @@ endif
nmap K K<cr> nmap K K<cr>
" stolen from auctex.vim " stolen from auctex.vim
function! EmacsKill() if has('eval')
if col(".") == strlen(getline(line(".")))+1 fun! EmacsKill()
let @" = "\<CR>" if col(".") == strlen(getline(line(".")))+1
return "\<Del>" let @" = "\<CR>"
else return "\<Del>"
return "\<C-O>D" else
endif return "\<C-O>D"
endfunction endif
endfun
endif
" some emacs-isms are OK " some emacs-isms are OK
map! <C-a> <Home> map! <C-a> <Home>
@ -298,7 +301,9 @@ map <C-a> <Home>
map! <C-e> <End> map! <C-e> <End>
map <C-e> <End> map <C-e> <End>
map <C-k> d$ map <C-k> d$
inoremap <buffer> <C-K> <C-R>=EmacsKill()<CR> if has('eval')
inoremap <buffer> <C-K> <C-R>=EmacsKill()<CR>
endif
" Disable q and Q " Disable q and Q
map q <Nop> map q <Nop>

1
zsh/bindkey
View file

@ -30,6 +30,7 @@ case $TERM in
bindkey '\e[c' emacs-forward-word bindkey '\e[c' emacs-forward-word
bindkey '\e[d' emacs-backward-word bindkey '\e[d' emacs-backward-word
bindkey '\M-B\M-^H' backward-kill-word bindkey '\M-B\M-^H' backward-kill-word
bindkey '\M-^H' backward-kill-word
bindkey '\M-C\M-?' backward-kill-word bindkey '\M-C\M-?' backward-kill-word
;; ;;
mlterm|kterm) mlterm|kterm)