Merge branch 'master' of git.gebner.org:etc
This commit is contained in:
		
						commit
						beaa209d52
					
				
							
								
								
									
										4
									
								
								vimrc
									
									
									
									
									
								
							
							
								
								
								
								
								
									
									
								
							
						
						
									
										4
									
								
								vimrc
									
									
									
									
									
								
							@ -27,6 +27,8 @@ NeoBundle 'Shougo/unite.vim'
 | 
				
			|||||||
NeoBundle 'tsukkee/unite-tag'
 | 
					NeoBundle 'tsukkee/unite-tag'
 | 
				
			||||||
NeoBundle 'Shougo/neomru.vim'
 | 
					NeoBundle 'Shougo/neomru.vim'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					NeoBundle 'ciaranm/securemodelines'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
NeoBundle 'nanotech/jellybeans.vim'
 | 
					NeoBundle 'nanotech/jellybeans.vim'
 | 
				
			||||||
NeoBundle 'majutsushi/tagbar'
 | 
					NeoBundle 'majutsushi/tagbar'
 | 
				
			||||||
NeoBundle 'bling/vim-airline'
 | 
					NeoBundle 'bling/vim-airline'
 | 
				
			||||||
@ -71,7 +73,7 @@ call neobundle#end()
 | 
				
			|||||||
filetype plugin indent on
 | 
					filetype plugin indent on
 | 
				
			||||||
 | 
					
 | 
				
			||||||
set tw=0 expandtab ts=8 sts=2 sw=2 sm ai si
 | 
					set tw=0 expandtab ts=8 sts=2 sw=2 sm ai si
 | 
				
			||||||
set ml mls=5				" scan 5 lines for modelines
 | 
					set noml mls=5				" scan 5 lines for modelines
 | 
				
			||||||
syn on						" enable syntax highlighting
 | 
					syn on						" enable syntax highlighting
 | 
				
			||||||
set hls						" highlight search
 | 
					set hls						" highlight search
 | 
				
			||||||
set bg=dark					" dark background
 | 
					set bg=dark					" dark background
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user