Mercurial > dotfiles

changeset 183:8b37877d309f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 20 Jul 2014 19:36:55 -0700
parents c1e0af8b032d (diff) 94a131d9a200 (current diff)
children 4504d9bf9861
files .hgsubstate vim/vimrc
diffstat 3 files changed, 46 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsub	Sun Jul 20 17:43:57 2014 -0700
+++ b/.hgsub	Sun Jul 20 19:36:55 2014 -0700
@@ -21,6 +21,9 @@
 vim/bundle/less = [git]https://github.com/groenewege/vim-less.git
 vim/bundle/twig = [git]https://github.com/beyondwords/vim-twig.git
 vim/bundle/tagbar = [git]https://github.com/majutsushi/tagbar.git
+vim/bundle/yankring = [git]https://github.com/vim-scripts/YankRing.vim.git
+vim/bundle/linediff = [git]https://github.com/AndrewRadev/linediff.vim.git
+vim/bundle/pythonmode = [git]https://github.com/klen/python-mode.git
 
 vim/bundle/lawrencium = https://bitbucket.org/ludovicchabant/vim-lawrencium
 vim/bundle/piecrust = https://bitbucket.org/ludovicchabant/vim-piecrust
--- a/.hgsubstate	Sun Jul 20 17:43:57 2014 -0700
+++ b/.hgsubstate	Sun Jul 20 19:36:55 2014 -0700
@@ -1,20 +1,22 @@
 f8703c9e2fb951ebb193b268faf7f0457abf8334 lib/hg/allpaths
-53423381c54045f2d6d9952ecb71916fb3878cd7 lib/hg/hg-git
+51b3b3b4927e876b8815c3f7242b56b189189b13 lib/hg/hg-git
 d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub
 db3707cbd8706f4bb054959ecc5cee82ac45687b vim/bundle/badwolf
 f134dd5726732a74e05edacc9a795006b984b82f vim/bundle/colorschemes
 a3ae0df1d9e13941e9e8086637055841ce93f7bd vim/bundle/commentary
 b5d3fe66a58a13d2ff8b6391f4387608496a030f vim/bundle/ctrlp
-8a5f2efc03d960b23f1b6278b30163f0346cd849 vim/bundle/easymotion
+3949408e594657ad3fa7d1302568acd734b831d4 vim/bundle/easymotion
 8f0b8edfbd246c0026b7a2388e1d883d579ac7f6 vim/bundle/fugitive
 eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo
 33279476a63276cf5858a568283407dd98d7eb74 vim/bundle/haml
-777063310a8d03797b9e8b8ae368da65fe7435a8 vim/bundle/lawrencium
+7fcb71064e85e2696d04315736fe55aeaeebe9c7 vim/bundle/lawrencium
 5d965c221b90fb168bf9f447a332c9ff6f62e666 vim/bundle/less
+0ab83da0e11ca98ec0407b35c0a9e183f355616a vim/bundle/linediff
 61deff1362b5ea4c63eead77a52c51316fa7d433 vim/bundle/markdown
 b0bb781fc73ef40365e4c996a16f04368d64fc9d vim/bundle/nerdtree
 af8514b79c046a6bb447021b81351edb050ac69f vim/bundle/piecrust
 114f8e5c204f1cac9b2443065910fa182de39fb8 vim/bundle/powerline
+626a3a9d6faa029ea37d5b90e5067d8744f2ccfc vim/bundle/pythonmode
 a90b2b60454fabe9a969d00b5d7f8d752ab61bd4 vim/bundle/ragtag
 2a3c5f8e3c26a57b8eb4cfc4be79615a1c508ef6 vim/bundle/repeat
 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized
@@ -24,3 +26,4 @@
 614b5b244f3a7a9e0174ebcf73c809de6e62e32c vim/bundle/tagbar
 869c05195086dd1af9fe39e49621f9f880b6f07c vim/bundle/twig
 b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom
+a884f3a161fa3cd8c996eb53a3d1c68631f60c21 vim/bundle/yankring
--- a/vim/vimrc	Sun Jul 20 17:43:57 2014 -0700
+++ b/vim/vimrc	Sun Jul 20 19:36:55 2014 -0700
@@ -213,6 +213,8 @@
 
 " Plugin Settings {{{
 
+" Ctrl-P {{{
+
 " We'll set our own mappings.
 let g:ctrlp_map = ''
 
@@ -227,8 +229,19 @@
 " Make Ctrl-P cache stuff in our temp directory.
 let g:ctrlp_cache_dir = s:vim_home.'/cache'
 
+" }}}
+
+" Syntastic {{{
+
 " Use `pyflakes` with `syntastic`.
 let g:syntastic_python_checkers = ['pyflakes']
+let g:syntastic_mode_map = {
+            \'mode': 'active',
+            \'passive_filetypes': []}
+
+" }}}
+
+" Lawrencium {{{
 
 " Custom Mercurial commands highlighting in Lawrencium.
 let g:lawrencium_hg_commands_file_types = {
@@ -240,6 +253,28 @@
 
 " }}}
 
+" Gundo {{{
+
+let g:gundo_map_move_older = '<Down>'
+let g:gundo_map_move_newer = '<Up>'
+
+" }}}
+
+" YankRing {{{
+
+let g:yankring_replace_n_pkey = '<C-K>'
+let g:yankring_replace_p_pkey = '<C-J>'
+
+" }}}
+
+" Python-Mode {{{
+
+let g:pymode = 0
+
+" }}}
+
+" }}}
+
 " File-Specific Settings {{{
 
 if has("autocmd")
@@ -286,12 +321,9 @@
 noremap <end> g<end>
 
 " Tab navigation
-nnoremap <C-Tab> :tabnext<cr>
-nnoremap <C-S-Tab> :tabprevious<cr>
+noremap <C-Tab>   :tabnext<cr>
+noremap <C-S-Tab> :tabprevious<cr>
 
-" Buffer navigation
-nnoremap <C-S-right> :bnext<cr>
-nnoremap <C-S-left> :bprevious<cr>
 
 " Window navigation
 nnoremap <C-up> :wincmd k<cr>