Merge branch 'develop'
This commit is contained in:
		
						commit
						2ae50411ff
					
				
					 1 changed files with 1 additions and 5 deletions
				
			
		| 
						 | 
					@ -140,17 +140,13 @@ let g:javascript_plugin_jsdoc = 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
" GlobalListchars
 | 
					" GlobalListchars
 | 
				
			||||||
set list
 | 
					set list
 | 
				
			||||||
set listchars=eol:¶,trail:~,nbsp:␣
 | 
					set listchars=tab:··,trail:·,nbsp:·
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
" Keeps everything concealed at all times. Even when cursor is on the word.
 | 
					" Keeps everything concealed at all times. Even when cursor is on the word.
 | 
				
			||||||
set conceallevel=1
 | 
					set conceallevel=1
 | 
				
			||||||
set concealcursor=nvic
 | 
					set concealcursor=nvic
 | 
				
			||||||
 | 
					
 | 
				
			||||||
" JavaScript thanks to pangloss/vim-javascript
 | 
					 | 
				
			||||||
" let g:javascript_conceal_function = "ƒ"
 | 
					 | 
				
			||||||
" match ErrorMsg /ƒ/
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
" Ultisnips
 | 
					" Ultisnips
 | 
				
			||||||
" Track the engine.
 | 
					" Track the engine.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue