Mercurial > ec-dotfiles
changeset 38:8eebbf68181c
Merge!
| author | Edho Prima Arief <me@myconan.net> |
|---|---|
| date | Fri, 15 Apr 2011 21:55:47 +0700 |
| parents | a8dc309a1b8a (diff) be694d1629c8 (current diff) |
| children | 3a9d39d8805b |
| files | |
| diffstat | 3 files changed, 16 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hg Fri Apr 15 21:53:12 2011 +0700 +++ b/hg Fri Apr 15 21:55:47 2011 +0700 @@ -1,6 +1,7 @@ [ui] username = Edho Prima Arief <me@myconan.net> merge = vimdiff +verbose = true [merge-tools] vimdiff.executable = vim @@ -8,7 +9,4 @@ [extensions] hgext.convert = -hgext.bookmarks = -hgext.rebase = -hggit = - +progress =
--- a/tcsh Fri Apr 15 21:53:12 2011 +0700 +++ b/tcsh Fri Apr 15 21:55:47 2011 +0700 @@ -91,6 +91,6 @@ endsw unset gnuls_opts -( which vim ) > /dev/null && alias vi vim +( which vim ) > /dev/null && alias vi vim && setenv EDITOR vim [ -e "${HOME}/.tcsh_init.after" ] && source "${HOME}/.tcsh_init.after"
--- a/vim Fri Apr 15 21:53:12 2011 +0700 +++ b/vim Fri Apr 15 21:55:47 2011 +0700 @@ -14,3 +14,16 @@ set ts=2 set expandtab set title + +map <C-t><up> :tabr<cr> +map <C-t><down> :tabl<cr> +map <C-t><left> :tabp<cr> +map <C-t><right> :tabn<cr> +map <C-t>p :tabp<cr> +map <C-t>n :tabn<cr> +map <C-t><C-t> :NERDTreeToggle<cr> +map <C-t><C-m> :NERDTreeMirror<cr> + +"autocmd VimEnter * NERDTree +"autocmd BufEnter * NERDTreeMirror +