aboutsummaryrefslogtreecommitdiff
path: root/vimrc-full
diff options
context:
space:
mode:
Diffstat (limited to 'vimrc-full')
-rw-r--r--vimrc-full32
1 files changed, 17 insertions, 15 deletions
diff --git a/vimrc-full b/vimrc-full
index ab8c97c..9a7e34e 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -130,12 +130,16 @@ if has("gui_running")
130 set guioptions-=L | " do not show left scrollbar 130 set guioptions-=L | " do not show left scrollbar
131 set guioptions-=r | " do not show right scrollbar 131 set guioptions-=r | " do not show right scrollbar
132 set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped) 132 set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped)
133 " set guifont=Dejavu\ Sans\ Mono\ for\ Powerline\ 10
134 " set guifont=Source\ Code\ Pro\ Semi-Bold\ 10
135 " set guifont=Droid\ Sans\ Mono\ for\ Powerline\ 12
136 set guifont=Dejavu\ Sans\ Mono\ For\ Powerline\ Semibold
137" set selectmode=mouse,key,cmd | " enters vim's select mode when pressing shift-left or shift-END 133" set selectmode=mouse,key,cmd | " enters vim's select mode when pressing shift-left or shift-END
138" set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text 134" set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text
135
136
137 " its possible to define alternative fonts (order matters)
138 set guifont=
139 set guifont+=Source\ Code\ Pro\ for\ Powerline\ SemiBold\ 10
140 set guifont+=Meslo\ LG\ M\ for\ Powerline\ Bold\ 10
141 set guifont+=Droid\ Sans\ Mono\ for\ Powerline
142 set guifont+=Dejavu\ Sans\ Mono\ for\ Powerline\ Semibold
139endif 143endif
140 144
141" ======================================================================================================================= 145" =======================================================================================================================
@@ -213,7 +217,14 @@ endif
213 217
214 218
215" NEOVIM_incompatible: 219" NEOVIM_incompatible:
216if !has('nvim') | " settings which have been removed from neovim 220"
221if has('nvim') " Neovim?
222 autocmd TermOpen term://* set nobuflisted
223 " use default ESC key to leave insert mode in the internal terminal emulator
224 tnoremap <Esc> <C-\><C-n>
225else " default Vim?
226 autocmd VimLeave * call system("echo -n $'" . escape(getreg(), "'") . "' | xsel -ib")
227
217 set ttymouse=xterm2 228 set ttymouse=xterm2
218 set ttyscroll=100 | " improves speed for terminal vim, incomp. with nvim 229 set ttyscroll=100 | " improves speed for terminal vim, incomp. with nvim
219 set ttyfast | " improves speed for terminal vim (incomp. with nvim) 230 set ttyfast | " improves speed for terminal vim (incomp. with nvim)
@@ -228,6 +239,7 @@ if !has('nvim') | " settings which have been removed from neovim
228 endif 239 endif
229endif 240endif
230 241
242
231if has("autocmd") 243if has("autocmd")
232 set modeline | " set variables specific to a file, like indentation by adding a comment 244 set modeline | " set variables specific to a file, like indentation by adding a comment
233 " set default completion function in case YouCompleteMe cannot help 245 " set default completion function in case YouCompleteMe cannot help
@@ -301,16 +313,6 @@ if has("autocmd")
301 "endif 313 "endif
302 augroup END 314 augroup END
303 315
304 if has('nvim')
305 autocmd TermOpen term://* set nobuflisted
306 " use default ESC key to leave insert mode in the internal terminal emulator
307 tnoremap <Esc> <C-\><C-n>
308 else
309 augroup vimonly
310 autocmd VimLeave * call system("echo -n $'" . escape(getreg(), "'") . "' | xsel -ib")
311 augroup END
312 endif
313
314 " autocmd BufNewFile set nobuflisted 316 " autocmd BufNewFile set nobuflisted
315 " use the shada/viminfo file to return the cursor to where it was... 317 " use the shada/viminfo file to return the cursor to where it was...
316 function! ReturnCursor() 318 function! ReturnCursor()
..