dotfiles: vim/vimrc annotate

annotate vim/vimrc @ 408:1da269c50dca

Fix python 2/3 loading order problem in Vim.

author	Ludovic Chabant <ludovic@chabant.com>
date	Wed, 10 Jan 2018 00:02:16 -0800
parents	c175fda4aa2e
children	63463782d1cd

rev	line source
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	1 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	2 "
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	3 " Ludovic Chabant's ~/.vimrc
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	4 "
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	5 " http://ludovic.chabant.com
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	6 "
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	7 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	8
59 6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	9 " Global Setup {{{
6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	10
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	11 " Use Vim settings, rather then Vi settings (much better!).
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	12 " This must be first, because it changes other options as a side effect.
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	13 set nocompatible
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	14
45 aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	15 " Set a variable that says we already sourced this file, for those few
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	16 " settings we don't want to re-apply.
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	17 if exists('g:sourced_vimrc')
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	18 let g:resourcing_vimrc = 1
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	19 endif
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	20 let g:sourced_vimrc = 1
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	21
83 a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	22 " Get the platform we're running on.
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	23 if has("win32") \|\| has("win64") \|\| has("dos32")
83 a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	24 let s:vim_platform = "windows"
286 a29080fb35d9 Add support for local Vim bundle. Ludovic Chabant <ludovic@chabant.com> parents: 284 diff changeset	25 let s:path_sep = "\\"
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	26 else
83 a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	27 let s:vim_platform = "unix"
286 a29080fb35d9 Add support for local Vim bundle. Ludovic Chabant <ludovic@chabant.com> parents: 284 diff changeset	28 let s:path_sep = '/'
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	29 endif
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	30
83 a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	31 " Get our vim directory.
95 b96ff0dd0137 Fixed the generated vimrc's runtimepath. Ludovic Chabant <ludovic@chabant.com> parents: 83 diff changeset	32 let s:vim_home = expand("<sfile>:h")
83 a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	33
386 b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	34 " Local pre-override.
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	35 let s:local_vimrc_pre = s:vim_home.'/vimrc-local-pre'
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	36 if filereadable(s:local_vimrc_pre)
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	37 execute 'source' s:local_vimrc_pre
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	38 endif
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	39
127 1f709d7e03c6 Better Python dev in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	40 " Make sure `filetype` stuff is turned off before loading Pathogen.
1f709d7e03c6 Better Python dev in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	41 syntax off
1f709d7e03c6 Better Python dev in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	42 filetype off
1f709d7e03c6 Better Python dev in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	43
18 cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	44 " Disable some plugins.
386 b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	45 let g:pathogen_disabled = get(g:, 'pathogen_disabled', [])
45 aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	46 call add(g:pathogen_disabled, 'vimroom')
76 990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	47 call add(g:pathogen_disabled, 'minibufexpl')
127 1f709d7e03c6 Better Python dev in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	48 call add(g:pathogen_disabled, 'ragtag')
308 52d4d0fa195b Vim config changes. Ludovic Chabant <ludovic@chabant.com> parents: 307 diff changeset	49 call add(g:pathogen_disabled, 'interestingwords')
18 cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	50
347 4d73159f56ca Use pathogen as a sub-repo, plus a few Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 332 diff changeset	51 " Load pathogen.
349 8d68547c3660 Fix pathogen initialization. Ludovic Chabant <ludovic@chabant.com> parents: 347 diff changeset	52 runtime bundle/pathogen/autoload/pathogen.vim
352 9580765366a4 Fix some python indenting stuff in vim. Ludovic Chabant <ludovic@chabant.com> parents: 349 diff changeset	53 " Add the bundle directory, and potentially add the local one if it exists.
9580765366a4 Fix some python indenting stuff in vim. Ludovic Chabant <ludovic@chabant.com> parents: 349 diff changeset	54 " Note that we pass absolute paths to make pathogen prepend stuff before Vim's
9580765366a4 Fix some python indenting stuff in vim. Ludovic Chabant <ludovic@chabant.com> parents: 349 diff changeset	55 " system files otherwise stuff like indent plugins don't work.
9580765366a4 Fix some python indenting stuff in vim. Ludovic Chabant <ludovic@chabant.com> parents: 349 diff changeset	56 let s:pathogen_bundles = [s:vim_home.s:path_sep.'bundle'.s:path_sep.'{}']
286 a29080fb35d9 Add support for local Vim bundle. Ludovic Chabant <ludovic@chabant.com> parents: 284 diff changeset	57 if isdirectory(s:vim_home.s:path_sep.'local')
352 9580765366a4 Fix some python indenting stuff in vim. Ludovic Chabant <ludovic@chabant.com> parents: 349 diff changeset	58 call add(s:pathogen_bundles, s:vim_home.s:path_sep.'local'.s:path_sep.'{}')
286 a29080fb35d9 Add support for local Vim bundle. Ludovic Chabant <ludovic@chabant.com> parents: 284 diff changeset	59 endif
347 4d73159f56ca Use pathogen as a sub-repo, plus a few Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 332 diff changeset	60 call call('pathogen#infect', s:pathogen_bundles)
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	61
10 00cac5ebf546 Added default window size. Added buffer keyboard shortcuts. ludovicchabant parents: 6 diff changeset	62 " Hide the toolbar in MacVim/gVIM, and set a nice window size.
45 aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	63 if has("gui_running") && !exists('g:resourcing_vimrc')
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	64 set guioptions=-t
235 ceb3f44fa2fc Update sub-repos, make Vim maximized by default. Ludovic Chabant <ludovic@chabant.com> parents: 233 diff changeset	65 set lines=999
ceb3f44fa2fc Update sub-repos, make Vim maximized by default. Ludovic Chabant <ludovic@chabant.com> parents: 233 diff changeset	66 set columns=999
323 e2d944ecda66 Maximize on startup on Windows. Ludovic Chabant <ludovic@chabant.com> parents: 320 diff changeset	67 if has("win32")
e2d944ecda66 Maximize on startup on Windows. Ludovic Chabant <ludovic@chabant.com> parents: 320 diff changeset	68 au GUIEnter * simalt ~x
e2d944ecda66 Maximize on startup on Windows. Ludovic Chabant <ludovic@chabant.com> parents: 320 diff changeset	69 endif
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	70 endif
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	71
59 6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	72 " }}}
6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	73
6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	74 " General Settings {{{
6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	75
135 db9d5fe86723 Enable modelines. Ludovic Chabant <ludovic@chabant.com> parents: 131 diff changeset	76 " Restrict modelines.
db9d5fe86723 Enable modelines. Ludovic Chabant <ludovic@chabant.com> parents: 131 diff changeset	77 set modelines=1
18 cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	78
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	79 " Don't unload abandoned buffers.
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	80 set hidden
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	81
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	82 " Show line numbers.
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	83 set number
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	84
18 cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	85 " Show what mode we're in, and what command we're typing.
cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	86 set showmode
cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	87 set showcmd
cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	88
cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	89 " Keep the cursor off the top/bottom edges.
cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	90 set scrolloff=3
cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	91
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	92 " Smart auto-indenting.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	93 set autoindent
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	94 set smartindent
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	95
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	96 " Use confirmation dialog.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	97 set confirm
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	98
76 990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	99 " Don't use annoying sounds.
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	100 set visualbell
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	101
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	102 " Remember lots of commands.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	103 set history=1000
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	104
76 990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	105 " Try to reduce flickering.
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	106 set lazyredraw
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	107
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	108 " Show matching braces but not for too long.
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	109 set showmatch
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	110 set matchtime=2
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	111
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	112 " Show soft-broken/wrapped lines with a prefix.
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	113 set showbreak=→
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	114
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	115 " Use incremental search, with highlighting,
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	116 " case-insensitive unless we actually type some
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	117 " mixed-case stuff.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	118 set incsearch
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	119 set hlsearch
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	120 set ignorecase
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	121 set smartcase
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	122
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	123 " Always show window status lines.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	124 set laststatus=2
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	125
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	126 " Enable using the mouse like some everyday guy.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	127 set mouse=a
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	128
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	129 " Show interesting stuff at the bottom of the window.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	130 set showcmd
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	131 set ruler
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	132
76 990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	133 " Make sure splitting windows is done in a way that makes sense.
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	134 set splitbelow
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	135 set splitright
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	136
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	137 " Don't pollute the hard-drive with *~ files. Only
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	138 " create them in hidden backup/temp directories while
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	139 " we edit the file, and then get rid of it.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	140 set nobackup
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	141 set writebackup
83 a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	142 execute('set backupdir='.s:vim_home.'/backup')
a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	143 execute('set directory='.s:vim_home.'/temp')
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	144
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	145 " Better command-line completion, but don't show some
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	146 " stuff we don't care about.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	147 set wildmenu
317 b0b868bb0d44 More vim changes. Ludovic Chabant <ludovic@chabant.com> parents: 316 diff changeset	148 set wildmode=list:longest
b0b868bb0d44 More vim changes. Ludovic Chabant <ludovic@chabant.com> parents: 316 diff changeset	149 set wildignore+=.DS_Store,Thumbs.db
b0b868bb0d44 More vim changes. Ludovic Chabant <ludovic@chabant.com> parents: 316 diff changeset	150 set wildignore+=.so,.dll,.exe,.lib,*.pdb
b0b868bb0d44 More vim changes. Ludovic Chabant <ludovic@chabant.com> parents: 316 diff changeset	151 set wildignore+=.pyc,.pyo
b0b868bb0d44 More vim changes. Ludovic Chabant <ludovic@chabant.com> parents: 316 diff changeset	152 set wildignore+=*.swp
b0b868bb0d44 More vim changes. Ludovic Chabant <ludovic@chabant.com> parents: 316 diff changeset	153
b0b868bb0d44 More vim changes. Ludovic Chabant <ludovic@chabant.com> parents: 316 diff changeset	154 set formatoptions=croqn1
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	155
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	156 " Always display the tab-page line.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	157 set showtabline=2
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	158
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	159 " Set the file-formats.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	160 set ffs=unix,mac,dos
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	161
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	162 " Tabs and indenting are 4 characters, and tabs behave like
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	163 " spaces during editing. They're smart, too, and when you
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	164 " press <TAB> it actually inserts a soft-tab so everything's
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	165 " indented the same.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	166 set tabstop=4
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	167 set shiftwidth=4
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	168 set softtabstop=4
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	169 set smarttab
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	170 set expandtab
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	171
18 cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	172 " Default encoding
cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	173 set encoding=utf-8
cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	174
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	175 " Clipboard buffer.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	176 set clipboard=unnamed
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	177
352 9580765366a4 Fix some python indenting stuff in vim. Ludovic Chabant <ludovic@chabant.com> parents: 349 diff changeset	178 " Smooth terminal experience.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	179 set ttyfast
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	180
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	181 " Allow backspacing over anything.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	182 set backspace=indent,eol,start
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	183
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	184 " Going left and right let you go to other lines.
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	185 set whichwrap+=<,>,h,l
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	186
93 822fc8b4405f Invisible characters in vimrc. Ludovic Chabant <ludovic@chabant.com> parents: 92 diff changeset	187 " How to show invisible characters
822fc8b4405f Invisible characters in vimrc. Ludovic Chabant <ludovic@chabant.com> parents: 92 diff changeset	188 set listchars=eol:$,tab:>-,trail:-,extends:>,precedes:<,nbsp:%,conceal:.
822fc8b4405f Invisible characters in vimrc. Ludovic Chabant <ludovic@chabant.com> parents: 92 diff changeset	189
80 121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	190 " Nice auto-complete menu.
308 52d4d0fa195b Vim config changes. Ludovic Chabant <ludovic@chabant.com> parents: 307 diff changeset	191 set complete=.,w,b,u,t
80 121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	192 set completeopt=longest,menuone,preview
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	193
121 c6f0172aac8d Add nice column indicators in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 119 diff changeset	194 " Column indicators.
c6f0172aac8d Add nice column indicators in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 119 diff changeset	195 set colorcolumn=72,79
c6f0172aac8d Add nice column indicators in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 119 diff changeset	196
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	197 " And now, for some system-dependent settings:
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	198 " - font to use
83 a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	199 if s:vim_platform == "windows"
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	200 set guifont=Consolas:h12
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	201 else
356 2060d92ccc2f Use `hack` font if it's there. Ludovic Chabant <ludovic@chabant.com> parents: 352 diff changeset	202 set guifont=Hack:h12,Monaco:h12
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	203 endif
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	204
45 aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	205 " Syntax highlighting.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	206 syntax on
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	207
18 cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	208 " Change the current directory to the home directory.
45 aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	209 if !exists('g:resourcing_vimrc')
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	210 cd ~/
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	211 endif
18 cec2213f938c Removed some MiniBufExplorer mappings. Ludovic Chabant <ludovic@chabant.com> parents: 13 diff changeset	212
45 aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	213 " Default color scheme.
47 ee3d235ca3fb Added solarized. Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	214 if has('gui_running')
217 6ee245fa8a3d Proper colors in iTerm2, and now using solarized for a change. Ludovic Chabant <ludovic@chabant.com> parents: 213 diff changeset	215 set background=dark
47 ee3d235ca3fb Added solarized. Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	216 else
ee3d235ca3fb Added solarized. Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	217 set background=dark
314 5f9d52300aaa Vim tweaks: Ludovic Chabant <ludovic@chabant.com> parents: 313 diff changeset	218 let g:solarized_termcolors = 256
5f9d52300aaa Vim tweaks: Ludovic Chabant <ludovic@chabant.com> parents: 313 diff changeset	219 let g:solarized_termtrans = 1
47 ee3d235ca3fb Added solarized. Ludovic Chabant <ludovic@chabant.com> parents: 45 diff changeset	220 endif
217 6ee245fa8a3d Proper colors in iTerm2, and now using solarized for a change. Ludovic Chabant <ludovic@chabant.com> parents: 213 diff changeset	221 colorscheme solarized
6 f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	222
f8792d288397 Big vimrc update. ludovicchabant parents: 0 diff changeset	223 " Enable file type detection.
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	224 filetype indent plugin on
9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	225
59 6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	226 " }}}
6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	227
76 990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	228 " Auto-Commands {{{
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	229
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	230 " Only show the highlighted cursor line in the current window.
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	231 augroup CursorLine
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	232 au!
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	233 au WinLeave * set nocursorline
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	234 au WinEnter * set cursorline
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	235 augroup END
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	236
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	237 " }}}
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	238
59 6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	239 " Plugin Settings {{{
6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	240
309 5b7acab16766 Make NERDTree ignore stuff, and other Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 303 diff changeset	241 " NERDTree {{{
5b7acab16766 Make NERDTree ignore stuff, and other Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 303 diff changeset	242
320 f95b6f36049b More vim stuff. Ludovic Chabant <ludovic@chabant.com> parents: 317 diff changeset	243 let NERDTreeRespectWildIgnore = 1
309 5b7acab16766 Make NERDTree ignore stuff, and other Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 303 diff changeset	244
5b7acab16766 Make NERDTree ignore stuff, and other Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 303 diff changeset	245 " }}}
5b7acab16766 Make NERDTree ignore stuff, and other Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 303 diff changeset	246
178 94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	247 " Ctrl-P {{{
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	248
80 121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	249 " We'll set our own mappings.
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	250 let g:ctrlp_map = ''
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	251
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	252 " Ctrl-P should manage the working directory.
173 393449253540 Use the new notation for `ctrlp` setting. Ludovic Chabant <ludovic@chabant.com> parents: 171 diff changeset	253 let g:ctrlp_working_path_mode = 'ra'
80 121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	254
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	255 " Ctrl-P should however ignore some stuff.
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	256 let g:ctrlp_custom_ignore = {
233 073e7e47dbeb Change CtrlP ignored dirs. Ludovic Chabant <ludovic@chabant.com> parents: 219 diff changeset	257 \ 'dir': '\v[\/](\.git\|\.hg\|\.svn\|venv\|static\|node_modules\|_cache\|_counter)$'
80 121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	258 \ }
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	259
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	260 " Make Ctrl-P cache stuff in our temp directory.
83 a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	261 let g:ctrlp_cache_dir = s:vim_home.'/cache'
10 00cac5ebf546 Added default window size. Added buffer keyboard shortcuts. ludovicchabant parents: 6 diff changeset	262
197 4d34bf15a478 Don't clear CtrlP cache on exit, fix Windows issues. Ludovic Chabant <ludovic@chabant.com> parents: 193 diff changeset	263 " Remember things.
386 b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	264 let g:ctrlp_clear_cache_on_exit = 0
197 4d34bf15a478 Don't clear CtrlP cache on exit, fix Windows issues. Ludovic Chabant <ludovic@chabant.com> parents: 193 diff changeset	265
317 b0b868bb0d44 More vim changes. Ludovic Chabant <ludovic@chabant.com> parents: 316 diff changeset	266 " Don't include some stuff in the most recently used list.
b0b868bb0d44 More vim changes. Ludovic Chabant <ludovic@chabant.com> parents: 316 diff changeset	267 let g:ctrlp_mruf_exclude = 'hg\-editor\-\d+\.txt'
b0b868bb0d44 More vim changes. Ludovic Chabant <ludovic@chabant.com> parents: 316 diff changeset	268
193 ae53d68033d9 Enable fugitive and some CtrlP extensions, include a new one of my own. Ludovic Chabant <ludovic@chabant.com> parents: 191 diff changeset	269 " Enable some cool extensions.
240 3a6b11d16a2a Simpler registration for CtrlP extensions. Ludovic Chabant <ludovic@chabant.com> parents: 235 diff changeset	270 let g:ctrlp_extensions = [
266 de3ef7fbcfc1 Add CtrlP's bookmarkdir extension. Ludovic Chabant <ludovic@chabant.com> parents: 252 diff changeset	271 \'tag', 'buffertag', 'quickfix', 'mixed', 'bookmarkdir',
288 25b672f0f6bd Remove `projectjump` CtrlP plugin, just use the bookmarks. Ludovic Chabant <ludovic@chabant.com> parents: 287 diff changeset	272 \'autoignore'
240 3a6b11d16a2a Simpler registration for CtrlP extensions. Ludovic Chabant <ludovic@chabant.com> parents: 235 diff changeset	273 \]
193 ae53d68033d9 Enable fugitive and some CtrlP extensions, include a new one of my own. Ludovic Chabant <ludovic@chabant.com> parents: 191 diff changeset	274
367 d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	275 " Use PyMatch to go faster.
408 1da269c50dca Fix python 2/3 loading order problem in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 392 diff changeset	276 if has('python3') \|\| has('python')
367 d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	277 let g:ctrlp_match_func = {'match': 'pymatcher#PyMatch'}
d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	278 let g:ctrlp_max_files = 0
d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	279 let g:ctrlp_lazy_update = 350
d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	280 endif
d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	281
178 94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	282 " }}}
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	283
213 769869e61101 Renamed autotags to gutentags. Ludovic Chabant <ludovic@chabant.com> parents: 212 diff changeset	284 " Gutentags {{{
206 dae926f52b9a Some Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	285
213 769869e61101 Renamed autotags to gutentags. Ludovic Chabant <ludovic@chabant.com> parents: 212 diff changeset	286 let g:gutentags_cache_dir = s:vim_home.'/tags'
373 083360925deb Tweaks for tags Ludovic Chabant <ludovic@chabant.com> parents: 369 diff changeset	287 let g:gutentags_ctags_exclude = ['venv', 'build', 'static', 'node_modules']
369 b87c358bd0ca Fix/improve ctagsrc for gutentags. Ludovic Chabant <ludovic@chabant.com> parents: 367 diff changeset	288 let g:gutentags_ctags_extra_args = ['--options='.s:vim_home.'/ctagsrc']
206 dae926f52b9a Some Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	289
dae926f52b9a Some Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	290 " }}}
dae926f52b9a Some Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	291
178 94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	292 " Syntastic {{{
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	293
314 5f9d52300aaa Vim tweaks: Ludovic Chabant <ludovic@chabant.com> parents: 313 diff changeset	294 let g:syntastic_auto_loc_list = 2
305 a333541a5c74 Syntastic config changes. Ludovic Chabant <ludovic@chabant.com> parents: 304 diff changeset	295 let g:syntastic_check_on_open = 1
a333541a5c74 Syntastic config changes. Ludovic Chabant <ludovic@chabant.com> parents: 304 diff changeset	296 let g:syntastic_check_on_wq = 0
a333541a5c74 Syntastic config changes. Ludovic Chabant <ludovic@chabant.com> parents: 304 diff changeset	297
219 738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab. Ludovic Chabant <ludovic@chabant.com> parents: 218 diff changeset	298 " flake8 includes pyflakes, pep8, and mccabe
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab. Ludovic Chabant <ludovic@chabant.com> parents: 218 diff changeset	299 " I could maybe replace pyflakes with frosted?
252 a2e31e166cb9 Just keep flake8 for Python checking in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 240 diff changeset	300 let g:syntastic_python_checkers = ['flake8'] ", 'pylint']
219 738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab. Ludovic Chabant <ludovic@chabant.com> parents: 218 diff changeset	301 let g:syntastic_python_python_exec = 'python3'
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab. Ludovic Chabant <ludovic@chabant.com> parents: 218 diff changeset	302
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab. Ludovic Chabant <ludovic@chabant.com> parents: 218 diff changeset	303 " }}}
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab. Ludovic Chabant <ludovic@chabant.com> parents: 218 diff changeset	304
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab. Ludovic Chabant <ludovic@chabant.com> parents: 218 diff changeset	305 " Supertab {{{
738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab. Ludovic Chabant <ludovic@chabant.com> parents: 218 diff changeset	306
308 52d4d0fa195b Vim config changes. Ludovic Chabant <ludovic@chabant.com> parents: 307 diff changeset	307 let g:SuperTabDefaultCompletionType = "context"
52d4d0fa195b Vim config changes. Ludovic Chabant <ludovic@chabant.com> parents: 307 diff changeset	308 let g:SuperTabLongestEnhanced = 1
52d4d0fa195b Vim config changes. Ludovic Chabant <ludovic@chabant.com> parents: 307 diff changeset	309 let g:SuperTabLongestHighlight = 0
219 738c1a3ad786 Update Python settings for Syntastic, new settings for Supertab. Ludovic Chabant <ludovic@chabant.com> parents: 218 diff changeset	310 let g:SuperTabCrMapping = 1
178 94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	311
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	312 " }}}
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	313
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	314 " Lawrencium {{{
118 c1ff96232138 New settings for Lawrencium. Ludovic Chabant <ludovic@chabant.com> parents: 114 diff changeset	315
127 1f709d7e03c6 Better Python dev in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	316 " Custom Mercurial commands highlighting in Lawrencium.
118 c1ff96232138 New settings for Lawrencium. Ludovic Chabant <ludovic@chabant.com> parents: 114 diff changeset	317 let g:lawrencium_hg_commands_file_types = {
c1ff96232138 New settings for Lawrencium. Ludovic Chabant <ludovic@chabant.com> parents: 114 diff changeset	318 \'clog': 'hggraphlog'
c1ff96232138 New settings for Lawrencium. Ludovic Chabant <ludovic@chabant.com> parents: 114 diff changeset	319 \}
c1ff96232138 New settings for Lawrencium. Ludovic Chabant <ludovic@chabant.com> parents: 114 diff changeset	320
127 1f709d7e03c6 Better Python dev in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	321 " Make the annotate window better in Lawrencium.
206 dae926f52b9a Some Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	322 let g:lawrencium_annotate_width_offset = 1
127 1f709d7e03c6 Better Python dev in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	323
59 6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	324 " }}}
6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	325
178 94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	326 " Gundo {{{
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	327
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	328 let g:gundo_map_move_older = '<Down>'
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	329 let g:gundo_map_move_newer = '<Up>'
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	330
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	331 " }}}
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	332
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	333 " YankRing {{{
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	334
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	335 let g:yankring_replace_n_pkey = '<C-K>'
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	336 let g:yankring_replace_p_pkey = '<C-J>'
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	337
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	338 " }}}
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	339
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	340 " Python-Mode {{{
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	341
204 4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	342 let g:pymode = 1
352 9580765366a4 Fix some python indenting stuff in vim. Ludovic Chabant <ludovic@chabant.com> parents: 349 diff changeset	343 let g:pymode_python = 'python3'
307 b09d451f3516 Okay let's try PythonMode again. Ludovic Chabant <ludovic@chabant.com> parents: 306 diff changeset	344
314 5f9d52300aaa Vim tweaks: Ludovic Chabant <ludovic@chabant.com> parents: 313 diff changeset	345 let g:pymode_syntax = 0
307 b09d451f3516 Okay let's try PythonMode again. Ludovic Chabant <ludovic@chabant.com> parents: 306 diff changeset	346 let g:pymode_syntax_all = 0
b09d451f3516 Okay let's try PythonMode again. Ludovic Chabant <ludovic@chabant.com> parents: 306 diff changeset	347 let g:pymode_syntax_builtin_objs = 1
204 4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	348 let g:pymode_syntax_print_as_function = 1
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	349 let g:pymode_syntax_space_errors = 1
307 b09d451f3516 Okay let's try PythonMode again. Ludovic Chabant <ludovic@chabant.com> parents: 306 diff changeset	350
352 9580765366a4 Fix some python indenting stuff in vim. Ludovic Chabant <ludovic@chabant.com> parents: 349 diff changeset	351 let g:pymode_indent = 0
9580765366a4 Fix some python indenting stuff in vim. Ludovic Chabant <ludovic@chabant.com> parents: 349 diff changeset	352
204 4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	353 let g:pymode_run = 0
307 b09d451f3516 Okay let's try PythonMode again. Ludovic Chabant <ludovic@chabant.com> parents: 306 diff changeset	354
204 4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	355 let g:pymode_lint = 0
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	356 let g:pymode_trim_whitespaces = 0
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	357 let g:pymode_folding = 1
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	358
307 b09d451f3516 Okay let's try PythonMode again. Ludovic Chabant <ludovic@chabant.com> parents: 306 diff changeset	359 let g:pymode_doc = 1
b09d451f3516 Okay let's try PythonMode again. Ludovic Chabant <ludovic@chabant.com> parents: 306 diff changeset	360 let g:pymode_doc_bind = 'K'
b09d451f3516 Okay let's try PythonMode again. Ludovic Chabant <ludovic@chabant.com> parents: 306 diff changeset	361
b09d451f3516 Okay let's try PythonMode again. Ludovic Chabant <ludovic@chabant.com> parents: 306 diff changeset	362 let g:pymode_virtualenv = 0
178 94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	363
314 5f9d52300aaa Vim tweaks: Ludovic Chabant <ludovic@chabant.com> parents: 313 diff changeset	364 let g:pymode_rope = 0
5f9d52300aaa Vim tweaks: Ludovic Chabant <ludovic@chabant.com> parents: 313 diff changeset	365
178 94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	366 " }}}
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	367
379 58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	368 " Lightline {{{
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	369 let g:lightline = {
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	370 \'colorscheme': 'solarized',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	371 \'active': {
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	372 \ 'left': [ ['mode', 'paste'],
386 b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	373 \ ['fugitive', 'lawrencium', 'readonly', 'relativepath', 'modified'],
379 58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	374 \ ['ctrlpmark'] ],
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	375 \ 'right': [ ['lineinfo'],
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	376 \ ['percent'],
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	377 \ ['fileformat', 'fileencoding', 'filetype'],
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	378 \ ['gutentags', 'syntastic', 'ycm_errs', 'ycm_warns'] ]
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	379 \ },
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	380 \'component_function': {
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	381 \ 'fugitive': '_LightlineFugitive',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	382 \ 'lawrencium': '_LightlineLawrencium',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	383 \ 'ctrlpmark': '_LightlineCtrlPMark',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	384 \ },
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	385 \'component_expand': {
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	386 \ 'syntastic': '_LightlineSyntastic',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	387 \ 'ycm_errs': '_LightlineYcmErrors',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	388 \ 'ycm_warns': '_LightlineYcmWarnings',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	389 \ 'gutentags': '_LightlineGutentags',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	390 \ },
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	391 \'component_type': {
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	392 \ 'syntastic': 'error',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	393 \ 'ycm_errs': 'error',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	394 \ 'ycm_warns': 'warning',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	395 \ 'gutentags': 'warning',
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	396 \ },
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	397 \}
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	398
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	399 function! _LightlineFugitive()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	400 return fugitive#head()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	401 endfunction
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	402
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	403 function! _LightlineLawrencium()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	404 return lawrencium#statusline()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	405 endfunction
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	406
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	407 function! _LightlineCtrlPMark()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	408 if expand('%:t') =~ 'ControlP' && has_key(g:lightline, 'ctrlp_item')
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	409 call lightline#link('iR'[g:lightline.ctrlp_regex])
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	410 return lightline#concatenate(
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	411 \['WAT?', g:lightline.ctrlp_prev,
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	412 \ g:lightline.ctrlp_item,
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	413 \ g:lightline.ctrlp_next],
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	414 \0)
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	415 else
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	416 return ''
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	417 endif
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	418 endfunction
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	419
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	420 function! _LightlineGutentags()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	421 return gutentags#statusline()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	422 endfunction
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	423
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	424 function! _LightlineSyntastic()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	425 return SyntasticStatuslineFlag()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	426 endfunction
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	427
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	428 function! _LightlineYcmErrors()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	429 let l:cnt = youcompleteme#GetErrorCount()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	430 return l:cnt > 0 ? string(l:cnt) : ''
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	431 endfunction
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	432
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	433 function! _LightlineYcmWarnings()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	434 let l:cnt = youcompleteme#GetWarningCount()
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	435 return l:cnt > 0 ? string(l:cnt) : ''
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	436 endfunction
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	437 " }}}
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	438
386 b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	439 " YouCompleteMe {{{
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	440
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	441 let g:ycm_always_populate_location_list = 1
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	442
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	443 " }}}
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	444
178 94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	445 " }}}
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	446
73 39a7e05637d8 Added 80 chars limit to text/markdown files. Ludovic Chabant <ludovic@chabant.com> parents: 67 diff changeset	447 " File-Specific Settings {{{
39a7e05637d8 Added 80 chars limit to text/markdown files. Ludovic Chabant <ludovic@chabant.com> parents: 67 diff changeset	448
204 4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	449 augroup VimRCFileType_markdown
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	450 au!
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	451 autocmd FileType text,markdown setlocal textwidth=80
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	452 autocmd FileType markdown nnoremap <buffer> <localleader>1 yypVr=:redraw<cr>
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	453 autocmd FileType markdown nnoremap <buffer> <localleader>2 yypVr-:redraw<cr>
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	454 autocmd FileType markdown nnoremap <buffer> <localleader>3 mzI###<space><esc>`z4l
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	455 autocmd FileType markdown nnoremap <buffer> <localleader>4 mzI####<space><esc>`z5l
176 c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	456
204 4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	457 autocmd BufRead,BufNewfile /Dropbox/Personal/SimpleNote/ set ft=markdown
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	458 autocmd BufRead,BufNewFile /_content//.html set ft=piecrustmarkdown
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	459 augroup END
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	460
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	461 augroup VimRCFileType_php
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	462 au!
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	463 " Who the hell changes my matchpairs?
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	464 autocmd FileType php setlocal matchpairs-=<:>
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	465 augroup END
83 a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	466
204 4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	467 augroup VimRCFileType_c
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	468 au!
386 b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	469 autocmd FileType c,c++,cpp,cs setlocal foldmethod=syntax
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	470 autocmd FileType c,c++,cpp,cs setlocal colorcolumn=120
204 4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	471 augroup END
83 a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	472
204 4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	473 augroup VimRCFileType_css
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	474 au!
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	475 autocmd BufNewFile,BufRead *.less setlocal filetype=less
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	476 autocmd Filetype less,css setlocal foldmethod=marker
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	477 autocmd Filetype less,css setlocal foldmarker={,}
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	478 autocmd Filetype less,css setlocal iskeyword+=-
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	479 autocmd Filetype less,css setlocal omnifunc=csscomplete#CompleteCSS
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	480 augroup END
160 5997455e475b Whitespace cleaning. Ludovic Chabant <ludovic@chabant.com> parents: 157 diff changeset	481
204 4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	482 augroup VimRCTrailingWhitespaces
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	483 au!
287 44c9d65cfa74 Readjust some Vim config stuff around folding. Ludovic Chabant <ludovic@chabant.com> parents: 286 diff changeset	484 autocmd FileType php,ruby,python,js,css,less autocmd BufWritePre <buffer> :call <SID>StripTrailingWhitespaces()
204 4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	485 augroup END
73 39a7e05637d8 Added 80 chars limit to text/markdown files. Ludovic Chabant <ludovic@chabant.com> parents: 67 diff changeset	486
39a7e05637d8 Added 80 chars limit to text/markdown files. Ludovic Chabant <ludovic@chabant.com> parents: 67 diff changeset	487 " }}}
39a7e05637d8 Added 80 chars limit to text/markdown files. Ludovic Chabant <ludovic@chabant.com> parents: 67 diff changeset	488
59 6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	489 " Mappings {{{
6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	490
42 6b831735c092 Added french keymap support. Ludovic Chabant <ludovic@chabant.com> parents: 18 diff changeset	491 let mapleader=","
43 25e8b2fffd50 Changed some mappings. Ludovic Chabant <ludovic@chabant.com> parents: 42 diff changeset	492
76 990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	493 " Visual line navigation
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	494 noremap <up> g<up>
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	495 noremap <down> g<down>
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	496 noremap <home> g<home>
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	497 noremap <end> g<end>
990968329a9b Disabled minibufexpl for a while. Ludovic Chabant <ludovic@chabant.com> parents: 73 diff changeset	498
367 d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	499 noremap <S-up> 20<up>
d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	500 noremap <S-down> 20<down>
d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	501
169 4947d1f99b72 Better tab/buffer navigation. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	502 " Tab navigation
178 94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	503 noremap <C-Tab> :tabnext<cr>
94bf0bd0a788 Updated sub-repos. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	504 noremap <C-S-Tab> :tabprevious<cr>
304 50fbd059a6a1 More Vim customizations. Ludovic Chabant <ludovic@chabant.com> parents: 303 diff changeset	505 nnoremap <leader>t :tabnew<cr>
169 4947d1f99b72 Better tab/buffer navigation. Ludovic Chabant <ludovic@chabant.com> parents: 163 diff changeset	506
80 121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	507 " Window navigation
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	508 nnoremap <C-up> :wincmd k<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	509 nnoremap <C-down> :wincmd j<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	510 nnoremap <C-left> :wincmd h<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	511 nnoremap <C-right> :wincmd l<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	512
176 c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	513 " Switch buffers.
c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	514 nnoremap <F2> :execute ("buffer " . bufname("#"))<cr>
83 a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	515
176 c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	516 " NERDTree.
c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	517 nnoremap <F3> :call <SID>ToggleNERDTree()<cr>
c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	518 nnoremap <F4> :call <SID>FindInNERDTree()<cr>
83 a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	519
157 7fd22eb11789 Added `tagbar` for Vim, with keyboard shortcut. Ludovic Chabant <ludovic@chabant.com> parents: 155 diff changeset	520 " Tagbar.
176 c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	521 nnoremap <F5> :TagbarToggle<cr>
c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	522 nnoremap <F6> :TagbarOpenAutoClose<cr>
157 7fd22eb11789 Added `tagbar` for Vim, with keyboard shortcut. Ludovic Chabant <ludovic@chabant.com> parents: 155 diff changeset	523
186 01304e9b4c19 Re-add Gundo mappings. Ludovic Chabant <ludovic@chabant.com> parents: 185 diff changeset	524 " Gundo.
01304e9b4c19 Re-add Gundo mappings. Ludovic Chabant <ludovic@chabant.com> parents: 185 diff changeset	525 nnoremap <F7> :GundoToggle<cr>
01304e9b4c19 Re-add Gundo mappings. Ludovic Chabant <ludovic@chabant.com> parents: 185 diff changeset	526
83 a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	527 " Common typos.
a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	528 nnoremap ; :
a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	529
80 121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	530 " Split windows
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	531 nnoremap <leader>s :split<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	532 nnoremap <leader>v :vsplit<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	533
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	534 " Easier things to type
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	535 nnoremap <leader>w :w<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	536 nnoremap <leader>q :q<cr>
119 6dbbf36a523d VIM changes: Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	537 nnoremap <leader>hh :Hg
6dbbf36a523d VIM changes: Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	538 nnoremap <leader>hg :Hg!
112 9495034e7dc4 New mappings in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 103 diff changeset	539 nnoremap <leader>hs :Hgstatus<cr>
9495034e7dc4 New mappings in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 103 diff changeset	540 nnoremap <leader>hv :Hgvdiff<cr>
80 121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	541
114 ccc3902408d2 Fix the hash key in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 113 diff changeset	542 " Make the hash-key not suck.
ccc3902408d2 Fix the hash key in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 113 diff changeset	543 inoremap # X<BS>#
ccc3902408d2 Fix the hash key in Vim. Ludovic Chabant <ludovic@chabant.com> parents: 113 diff changeset	544
80 121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	545 " Toggle invisible characters
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	546 nnoremap <leader>i :set list!<cr>
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	547
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	548 " Clear search matches
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	549 nnoremap <leader><space> :noh<cr>:call clearmatches()<cr>
43 25e8b2fffd50 Changed some mappings. Ludovic Chabant <ludovic@chabant.com> parents: 42 diff changeset	550
80 121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	551 " Ctrl-P mappings.
121bef55252f Added more VIM plugins (ctrlp, easymotion, powerline). Ludovic Chabant <ludovic@chabant.com> parents: 76 diff changeset	552 nnoremap <silent> <C-p> :CtrlP<cr>
83 a54180045075 Vimrc changes: Ludovic Chabant <ludovic@chabant.com> parents: 80 diff changeset	553 nnoremap <silent> <C-o> :CtrlPBuffer<cr>
193 ae53d68033d9 Enable fugitive and some CtrlP extensions, include a new one of my own. Ludovic Chabant <ludovic@chabant.com> parents: 191 diff changeset	554 nnoremap <silent> <C-u> :CtrlPTag<cr>
379 58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	555 nnoremap <silent> <C-y> :CtrlPBufTag<cr>
176 c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	556 nnoremap <silent> <Tab> :CtrlPMRUFiles<cr>
303 01ec865443b6 Update NERDTree macros and tweak more Vim stuff. Ludovic Chabant <ludovic@chabant.com> parents: 294 diff changeset	557 nnoremap <silent> <F8> :CtrlPBookmarkDir<cr>
73 39a7e05637d8 Added 80 chars limit to text/markdown files. Ludovic Chabant <ludovic@chabant.com> parents: 67 diff changeset	558
45 aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	559 " Switch between FR and US keyboard layouts.
119 6dbbf36a523d VIM changes: Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	560 nnoremap <C-l>f :setlocal keymap=french<cr>
6dbbf36a523d VIM changes: Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	561 nnoremap <C-l>u :setlocal keymap=<cr>
45 aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	562
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	563 " Toggle spell check according to current keyboard layout.
119 6dbbf36a523d VIM changes: Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	564 nnoremap <C-l>s :call <SID>ToggleSpellCheck()<cr>
45 aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	565
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	566 " Simple way to close a buffer without closing the window.
347 4d73159f56ca Use pathogen as a sub-repo, plus a few Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 332 diff changeset	567 nnoremap <leader>d :bprevious<cr>:bdelete #<cr>
43 25e8b2fffd50 Changed some mappings. Ludovic Chabant <ludovic@chabant.com> parents: 42 diff changeset	568
119 6dbbf36a523d VIM changes: Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	569 " Use sane regexes.
6dbbf36a523d VIM changes: Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	570 nnoremap / /\v
6dbbf36a523d VIM changes: Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	571 vnoremap / /\v
6dbbf36a523d VIM changes: Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	572
289 8b6ca7e40f37 Making jumping around in Vim nicer. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	573 " Next/previous quickfix and location messages.
303 01ec865443b6 Update NERDTree macros and tweak more Vim stuff. Ludovic Chabant <ludovic@chabant.com> parents: 294 diff changeset	574 " This is meant to be similar to ]c and [c for the diff navigation.
289 8b6ca7e40f37 Making jumping around in Vim nicer. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	575 nnoremap ]q :cnext<cr>zvzz
8b6ca7e40f37 Making jumping around in Vim nicer. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	576 nnoremap [q :cprevious<cr>zvzz
8b6ca7e40f37 Making jumping around in Vim nicer. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	577 nnoremap ]l :lnext<cr>zvzz
8b6ca7e40f37 Making jumping around in Vim nicer. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	578 nnoremap [l :lprevious<cr>zvzz
8b6ca7e40f37 Making jumping around in Vim nicer. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	579
304 50fbd059a6a1 More Vim customizations. Ludovic Chabant <ludovic@chabant.com> parents: 303 diff changeset	580 " Same with change and jump lists.
367 d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	581 nnoremap ]e g,zz
d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	582 nnoremap [e g;zz
304 50fbd059a6a1 More Vim customizations. Ludovic Chabant <ludovic@chabant.com> parents: 303 diff changeset	583 nnoremap ]j <C-I>
50fbd059a6a1 More Vim customizations. Ludovic Chabant <ludovic@chabant.com> parents: 303 diff changeset	584 nnoremap [j <C-O>
289 8b6ca7e40f37 Making jumping around in Vim nicer. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	585
367 d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	586 " Copy the current buffer's info.
386 b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	587 nnoremap <leader>cp :let @+ = expand('%:p')<cr>:echo @+<cr>
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	588 nnoremap <leader>cf :let @+ = expand('%:h')<cr>:echo @+<cr>
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	589 nnoremap <leader>cw :let @+ = getcwd()<cr>:echo @+<cr>
367 d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	590
303 01ec865443b6 Update NERDTree macros and tweak more Vim stuff. Ludovic Chabant <ludovic@chabant.com> parents: 294 diff changeset	591 " Make the diff navigation also center things.
289 8b6ca7e40f37 Making jumping around in Vim nicer. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	592 nnoremap ]c ]czvzz
8b6ca7e40f37 Making jumping around in Vim nicer. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	593 nnoremap [c [czvzz
8b6ca7e40f37 Making jumping around in Vim nicer. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	594
103 a755319f124e Added mappings for substitutions. Ludovic Chabant <ludovic@chabant.com> parents: 101 diff changeset	595 " Quick search and replace.
119 6dbbf36a523d VIM changes: Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	596 function! s:VSetSearch()
294 8bc056d80c39 Remove unused stuff, add grepping, shorter status line. Ludovic Chabant <ludovic@chabant.com> parents: 291 diff changeset	597 let temp = @@
8bc056d80c39 Remove unused stuff, add grepping, shorter status line. Ludovic Chabant <ludovic@chabant.com> parents: 291 diff changeset	598 norm! gvy
8bc056d80c39 Remove unused stuff, add grepping, shorter status line. Ludovic Chabant <ludovic@chabant.com> parents: 291 diff changeset	599 let @/ = '\V' . substitute(escape(@@, '\'), '\n', '\\n', 'g')
8bc056d80c39 Remove unused stuff, add grepping, shorter status line. Ludovic Chabant <ludovic@chabant.com> parents: 291 diff changeset	600 let @@ = temp
119 6dbbf36a523d VIM changes: Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	601 endfunction
6dbbf36a523d VIM changes: Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	602 vnoremap * :<C-u>call <SID>VSetSearch()<CR>//<CR><c-o>
6dbbf36a523d VIM changes: Ludovic Chabant <ludovic@chabant.com> parents: 118 diff changeset	603 vnoremap # :<C-u>call <SID>VSetSearch()<CR>??<CR><c-o>
118 c1ff96232138 New settings for Lawrencium. Ludovic Chabant <ludovic@chabant.com> parents: 114 diff changeset	604
294 8bc056d80c39 Remove unused stuff, add grepping, shorter status line. Ludovic Chabant <ludovic@chabant.com> parents: 291 diff changeset	605 nnoremap <leader>fa :vimgrep /<C-R><C-W>/
8bc056d80c39 Remove unused stuff, add grepping, shorter status line. Ludovic Chabant <ludovic@chabant.com> parents: 291 diff changeset	606 vnoremap <leader>fa "zy:vimgrep /<C-R>z/
8bc056d80c39 Remove unused stuff, add grepping, shorter status line. Ludovic Chabant <ludovic@chabant.com> parents: 291 diff changeset	607
206 dae926f52b9a Some Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	608 " Jump to tags by keeping things better in view. Option for jumping to a tag
dae926f52b9a Some Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	609 " in a split window where everything is folded except what you need to see.
303 01ec865443b6 Update NERDTree macros and tweak more Vim stuff. Ludovic Chabant <ludovic@chabant.com> parents: 294 diff changeset	610 " Note that if a tag search yield multiple possible results, we will still run
01ec865443b6 Update NERDTree macros and tweak more Vim stuff. Ludovic Chabant <ludovic@chabant.com> parents: 294 diff changeset	611 " some of that `zvzz` stuff, but that's OK, the main point is to not mess up
01ec865443b6 Update NERDTree macros and tweak more Vim stuff. Ludovic Chabant <ludovic@chabant.com> parents: 294 diff changeset	612 " the result selection window either.
308 52d4d0fa195b Vim config changes. Ludovic Chabant <ludovic@chabant.com> parents: 307 diff changeset	613 nnoremap <F9> :pop<cr>
373 083360925deb Tweaks for tags Ludovic Chabant <ludovic@chabant.com> parents: 369 diff changeset	614 nnoremap <F10> g<C-]>zvzz
083360925deb Tweaks for tags Ludovic Chabant <ludovic@chabant.com> parents: 369 diff changeset	615 nnoremap <s-F10> <c-w>vg<C-]>zMzvzz
308 52d4d0fa195b Vim config changes. Ludovic Chabant <ludovic@chabant.com> parents: 307 diff changeset	616 nnoremap <c-F9> :tprevious
52d4d0fa195b Vim config changes. Ludovic Chabant <ludovic@chabant.com> parents: 307 diff changeset	617 nnoremap <c-F10> :tnext
206 dae926f52b9a Some Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	618
dae926f52b9a Some Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	619 " Keep search matches in the middle of the window.
289 8b6ca7e40f37 Making jumping around in Vim nicer. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	620 nnoremap n nzvzz
8b6ca7e40f37 Making jumping around in Vim nicer. Ludovic Chabant <ludovic@chabant.com> parents: 288 diff changeset	621 nnoremap N Nzvzz
206 dae926f52b9a Some Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	622
379 58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	623 " YCM mappings.
386 b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	624 nnoremap <Leader>jj :YcmCompleter GoToImprecise<cr>zv
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	625 nnoremap <Leader>jd :YcmCompleter GoToDefinition<cr>zv
b570ad9917c0 Add local pre-override for vimrc. Bunch of other vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 381 diff changeset	626 nnoremap <Leader>jh :YcmCompleter GoToDeclaration<cr>zv
379 58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	627 nnoremap <Leader>ji :YcmCompleter GoToInclude<cr>
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	628 nnoremap <Leader>jc :YcmCompleter GetDoc<cr>
58410650ce36 Add lightline and remove old scratch. Customize Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 373 diff changeset	629
59 6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	630 " }}}
6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	631
204 4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	632 " Folding {{{
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	633
367 d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	634 " Start with one level of open.
d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	635 set foldlevel=1
d8ae3de7de06 More Vim tweaks. Ludovic Chabant <ludovic@chabant.com> parents: 356 diff changeset	636
385 d367df6afcad Don't fold too much. Ludovic Chabant <ludovic@chabant.com> parents: 379 diff changeset	637 " Don't fold too much.
d367df6afcad Don't fold too much. Ludovic Chabant <ludovic@chabant.com> parents: 379 diff changeset	638 set foldnestmax=2
d367df6afcad Don't fold too much. Ludovic Chabant <ludovic@chabant.com> parents: 379 diff changeset	639
287 44c9d65cfa74 Readjust some Vim config stuff around folding. Ludovic Chabant <ludovic@chabant.com> parents: 286 diff changeset	640 " Folds are defined by markers in the text.
44c9d65cfa74 Readjust some Vim config stuff around folding. Ludovic Chabant <ludovic@chabant.com> parents: 286 diff changeset	641 set foldmethod=marker
204 4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	642
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	643 " Toggle folds with <space>.
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	644 nnoremap <space> za
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	645
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	646 " Create folds with <space> (in visual mode).
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	647 vnoremap <space> zf
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	648
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	649 " }}}
4bd15b5afcfc Some cleanup and improvements to `vimrc`. Ludovic Chabant <ludovic@chabant.com> parents: 201 diff changeset	650
59 6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	651 " Abbreviations {{{
6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	652
43 25e8b2fffd50 Changed some mappings. Ludovic Chabant <ludovic@chabant.com> parents: 42 diff changeset	653 iabbrev @@ ludovic@chabant.com
25e8b2fffd50 Changed some mappings. Ludovic Chabant <ludovic@chabant.com> parents: 42 diff changeset	654 iabbrev ccopy Copyright ©2011 Ludovic Chabant, all rights reserved.
25e8b2fffd50 Changed some mappings. Ludovic Chabant <ludovic@chabant.com> parents: 42 diff changeset	655 iabbrev ssig --<cr>l u d o .<cr>. 8 0 17 80
0 9dbf340c7956 Initial commit Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	656
59 6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	657 " }}}
6df571869f4a Added statusline and fold-related mappings. Ludovic Chabant <ludovic@chabant.com> parents: 55 diff changeset	658
45 aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	659 " Functions {{{
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	660
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	661 function! s:ToggleSpellCheck() abort
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	662 if &spell ==? 'nospell'
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	663 if &keymap ==? 'french'
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	664 setlocal spell spelllang=fr_fr
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	665 else
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	666 setlocal spell spelllang=en_us,en_ca
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	667 endif
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	668 else
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	669 setlocal spell nospell
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	670 endif
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	671 endfunction
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	672
160 5997455e475b Whitespace cleaning. Ludovic Chabant <ludovic@chabant.com> parents: 157 diff changeset	673 function! s:StripTrailingWhitespaces() abort
5997455e475b Whitespace cleaning. Ludovic Chabant <ludovic@chabant.com> parents: 157 diff changeset	674 let l = line(".")
5997455e475b Whitespace cleaning. Ludovic Chabant <ludovic@chabant.com> parents: 157 diff changeset	675 let c = col(".")
5997455e475b Whitespace cleaning. Ludovic Chabant <ludovic@chabant.com> parents: 157 diff changeset	676 %s/\s\+$//e
5997455e475b Whitespace cleaning. Ludovic Chabant <ludovic@chabant.com> parents: 157 diff changeset	677 call cursor(l, c)
5997455e475b Whitespace cleaning. Ludovic Chabant <ludovic@chabant.com> parents: 157 diff changeset	678 endfunction
5997455e475b Whitespace cleaning. Ludovic Chabant <ludovic@chabant.com> parents: 157 diff changeset	679
176 c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	680 function! s:ToggleNERDTree() abort
c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	681 NERDTreeToggle
c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	682 endfunction
c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	683
c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	684 function! s:FindInNERDTree() abort
332 c44641ca37e2 Fix NERDTree stuff. Ludovic Chabant <ludovic@chabant.com> parents: 323 diff changeset	685 NERDTreeFind
c44641ca37e2 Fix NERDTree stuff. Ludovic Chabant <ludovic@chabant.com> parents: 323 diff changeset	686 normal zz
176 c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	687 endfunction
c6a072353606 Vim config changes: Ludovic Chabant <ludovic@chabant.com> parents: 173 diff changeset	688
45 aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	689 " }}}
aac6188ab4d6 Added vimroom plugin (disabled by default). Ludovic Chabant <ludovic@chabant.com> parents: 43 diff changeset	690
171 7559d8bc39bb Added local override of Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 169 diff changeset	691 " Local override {{{
7559d8bc39bb Added local override of Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 169 diff changeset	692
191 896acf280e7a Make local Vim config consistent with Mercurial local config. Ludovic Chabant <ludovic@chabant.com> parents: 186 diff changeset	693 let s:local_vimrc = s:vim_home.'/vimrc-local'
171 7559d8bc39bb Added local override of Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 169 diff changeset	694 if filereadable(s:local_vimrc)
7559d8bc39bb Added local override of Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 169 diff changeset	695 execute 'source' s:local_vimrc
7559d8bc39bb Added local override of Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 169 diff changeset	696 endif
7559d8bc39bb Added local override of Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 169 diff changeset	697
7559d8bc39bb Added local override of Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 169 diff changeset	698 " }}}
7559d8bc39bb Added local override of Vim settings. Ludovic Chabant <ludovic@chabant.com> parents: 169 diff changeset	699

Mercurial > dotfiles

annotate vim/vimrc @ 408:1da269c50dca