Mercurial > dotfiles
changeset 131:a273867b6a0d
Merged changes.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Thu, 26 Sep 2013 22:28:15 -0700 |
| parents | bb4697ae7425 (diff) 71f5975e7220 (current diff) |
| children | d190d7987730 |
| files | .hgsubstate vim/vimrc |
| diffstat | 10 files changed, 62 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Thu Sep 26 20:53:43 2013 -0700 +++ b/.hgsub Thu Sep 26 22:28:15 2013 -0700 @@ -25,4 +25,5 @@ lib/hg/hg-git = https://bitbucket.org/durin42/hg-git lib/hg/onsub = https://bitbucket.org/ludovicchabant/onsub +lib/hg/allpaths = https://bitbucket.org/ludovicchabant/allpaths
--- a/.hgsubstate Thu Sep 26 20:53:43 2013 -0700 +++ b/.hgsubstate Thu Sep 26 22:28:15 2013 -0700 @@ -1,11 +1,12 @@ -3b82cf6ac73ad8455a632516735070610eb5cd32 lib/hg/hg-git +f8703c9e2fb951ebb193b268faf7f0457abf8334 lib/hg/allpaths +a3c3b8077cbeec7c381a4b312d722d575a738610 lib/hg/hg-git d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub -65adfb4b8907a83556b4d43234b115bacd958472 vim/bundle/badwolf -9132dbf0a25bf2c825cf11caf5926758e5048eac vim/bundle/colorschemes -dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary -0d198fb5075ccd1dca4340a8b0e2725fb9a82bc8 vim/bundle/ctrlp +b8e07a24e77d3bad16a89bde409f97ccc307486a vim/bundle/badwolf +199924c0171bf7e52c832c2f5b26f7e0b13dfa73 vim/bundle/colorschemes +a3ae0df1d9e13941e9e8086637055841ce93f7bd vim/bundle/commentary +c1646e3c28d75bcc834af4836f4c6e12296ba891 vim/bundle/ctrlp 667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion -41383131b861c12abd82ad55a9546b9b715925a0 vim/bundle/fugitive +a0c71a6d4cb3b576ebbe42a270c8c48cbb23d185 vim/bundle/fugitive 8c570a493d260890242cbdc5a22d8500dc4604cb vim/bundle/gundo 9a891ed78a4b222e8c710e533e0d1f21259c0ef1 vim/bundle/haml 8c9aca0e4322f56bce43204a172f9d18b67f0cc2 vim/bundle/lawrencium @@ -13,11 +14,11 @@ dcdab0cd55da5e0b8655c000d99d96624cd6404c vim/bundle/markdown a1433c485eb254838c1db52e087d5ec4d1e77cfd vim/bundle/nerdtree af8514b79c046a6bb447021b81351edb050ac69f vim/bundle/piecrust -99277d9eed97a59cacc1db8c1dece2bcfd96d877 vim/bundle/powerline +114f8e5c204f1cac9b2443065910fa182de39fb8 vim/bundle/powerline 2f639ea61ab037e7862228d54a1c292f59c2385f vim/bundle/ragtag -613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat +d75a544b786710705f0db0d8d8fd66ca4a5a7239 vim/bundle/repeat 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized -7380c4f0db00992787975f51a3667378fb4cf2ea vim/bundle/supertab +ee35ab6954a11337a2b52003d07fabe442843b68 vim/bundle/supertab 1a73f607f8f5477d6942df2eb6e7245c4864f4d3 vim/bundle/surround -127422c11eeb61692a58e70fbefd096a39c80965 vim/bundle/syntastic +e5dfcc3488e407c8e28b308cb6e631336e77d060 vim/bundle/syntastic b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/build/update_subrepos.cmd Thu Sep 26 22:28:15 2013 -0700 @@ -0,0 +1,5 @@ +@echo off + +hg onsub -t hg "hg pull -u" +hg onsub -t git "git pull origin master" +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/build/update_subrepos.sh Thu Sep 26 22:28:15 2013 -0700 @@ -0,0 +1,5 @@ +#!/bin/sh + +hg onsub -t hg "hg pull -u" +hg onsub -t git "git pull origin master" +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/git/gitconfig Thu Sep 26 22:28:15 2013 -0700 @@ -0,0 +1,3 @@ +[user] +name = ludovicchabant +email = ludovic@chabant.com
--- a/install.cmd Thu Sep 26 20:53:43 2013 -0700 +++ b/install.cmd Thu Sep 26 22:28:15 2013 -0700 @@ -27,3 +27,11 @@ echo [extensions] >> "%userprofile%\mercurial.ini" echo hggit = %CWD:\=/%lib/hg/hg-git/hggit/ >> "%userprofile%\mercurial.ini" echo onsub = %CWD:\=/%lib/hg/onsub/onsub.py >> "%userprofile%\mercurial.ini" + +:: Git Files +if exist "%userprofile%\.gitconfig" ( + set /P confirm=Will delete existing "%userprofile%\.gitconfig". OK with that? Press CTRL-C to abort. + del /Q "%userprofile%\.gitconfig" +) +copy "%CWD%git\gitconfig" "%userprofile%\.gitconfig" +
--- a/install.sh Thu Sep 26 20:53:43 2013 -0700 +++ b/install.sh Thu Sep 26 22:28:15 2013 -0700 @@ -20,3 +20,8 @@ echo [extensions] >> "$HOME/.hgrc" echo hggit = $CWD/lib/hg/hg-git/hggit/ >> "$HOME/.hgrc" echo onsub = $CWD/lib/hg/onsub/onsub.py >> "$HOME/.hgrc" + +# GIT +# --- +cp "$CWD/git/gitconfig" "$HOME/.gitconfig" +
--- a/uninstall.cmd Thu Sep 26 20:53:43 2013 -0700 +++ b/uninstall.cmd Thu Sep 26 22:28:15 2013 -0700 @@ -6,3 +6,4 @@ rmdir /Q /S "%userprofile%\vimfiles" del "%userprofile%\_vimrc" del "%userprofile%\mercurial.ini" +del "%userprofile%\.gitconfig"
--- a/uninstall.sh Thu Sep 26 20:53:43 2013 -0700 +++ b/uninstall.sh Thu Sep 26 22:28:15 2013 -0700 @@ -5,3 +5,5 @@ rm $HOME/.vim rm $HOME/.vimrc rm $HOME/.hgrc +rm $HOME/.gitconfig +
--- a/vim/vimrc Thu Sep 26 20:53:43 2013 -0700 +++ b/vim/vimrc Thu Sep 26 22:28:15 2013 -0700 @@ -168,6 +168,9 @@ " Nice auto-complete menu. set completeopt=longest,menuone,preview +" Column indicators. +set colorcolumn=72,79 + " And now, for some system-dependent settings: " - font to use if s:vim_platform == "windows" @@ -218,7 +221,7 @@ " Ctrl-P should however ignore some stuff. let g:ctrlp_custom_ignore = { - \ 'dir': '\.git$\|\.hg$\|\.svn$|\venv$', + \ 'dir': '\v[\/](\.git|\.hg|\.svn|venv)$', \ 'file': '\.exe$\|\.so$\|\.dll$|\.pyc$|\.pyo$' \ } @@ -294,14 +297,11 @@ nnoremap <leader>s :split<cr> nnoremap <leader>v :vsplit<cr> -" Edit & source the VIMRC. -nnoremap <leader>ev :vsplit $MYVIMRC<cr> -nnoremap <leader>sv :source $MYVIMRC<cr> - " Easier things to type nnoremap <leader>w :w<cr> nnoremap <leader>q :q<cr> -nnoremap <leader>hg :Hg +nnoremap <leader>hh :Hg +nnoremap <leader>hg :Hg! nnoremap <leader>hs :Hgstatus<cr> nnoremap <leader>hv :Hgvdiff<cr> @@ -320,11 +320,11 @@ nnoremap <silent> <C-i> :CtrlPMRU<cr> " Switch between FR and US keyboard layouts. -nnoremap <leader>fr :setlocal keymap=french<cr> -nnoremap <leader>us :setlocal keymap=<cr> +nnoremap <C-l>f :setlocal keymap=french<cr> +nnoremap <C-l>u :setlocal keymap=<cr> " Toggle spell check according to current keyboard layout. -nnoremap <leader>sp :call <SID>ToggleSpellCheck()<cr> +nnoremap <C-l>s :call <SID>ToggleSpellCheck()<cr> " Simple way to close a buffer without closing the window. nnoremap <leader>bd :bprevious<cr>:bdelete #<cr> @@ -338,9 +338,19 @@ " File-type switching. nnoremap <leader>ftmd :set ft=markdown<cr> +" Use sane regexes. +nnoremap / /\v +vnoremap / /\v + " Quick search and replace. -nnoremap <leader>s :%s/\<<C-r><C-w>\>//g<left><left> -vnoremap <leader>s y:%s/<C-r>*//g<left><left> +function! s:VSetSearch() + let temp = @@ + norm! gvy + let @/ = '\V' . substitute(escape(@@, '\'), '\n', '\\n', 'g') + let @@ = temp +endfunction +vnoremap * :<C-u>call <SID>VSetSearch()<CR>//<CR><c-o> +vnoremap # :<C-u>call <SID>VSetSearch()<CR>??<CR><c-o> " }}}