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")
   set guioptions-=L   | " do not show left scrollbar
   set guioptions-=r   | " do not show right scrollbar
   set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped)
-  " set guifont=Dejavu\ Sans\ Mono\ for\ Powerline\ 10
-  " set guifont=Source\ Code\ Pro\ Semi-Bold\ 10
-  " set guifont=Droid\ Sans\ Mono\ for\ Powerline\ 12
-  set guifont=Dejavu\ Sans\ Mono\ For\ Powerline\ Semibold
 " set selectmode=mouse,key,cmd  | " enters vim's select mode when pressing shift-left or shift-END
 " set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text
+
+
+  " its possible to define alternative fonts (order matters)
+  set guifont=
+  set guifont+=Source\ Code\ Pro\ for\ Powerline\ SemiBold\ 10
+  set guifont+=Meslo\ LG\ M\ for\ Powerline\ Bold\ 10
+  set guifont+=Droid\ Sans\ Mono\ for\ Powerline
+  set guifont+=Dejavu\ Sans\ Mono\ for\ Powerline\ Semibold
 endif
 
 " =======================================================================================================================
@@ -213,7 +217,14 @@ endif
 
 
 " NEOVIM_incompatible:
-if !has('nvim')       | " settings which have been removed from neovim
+" 
+if has('nvim') " Neovim?
+  autocmd TermOpen term://* set nobuflisted
+  " use default ESC key to leave insert mode in the internal terminal emulator
+  tnoremap <Esc> <C-\><C-n>
+else           " default Vim?
+  autocmd VimLeave * call system("echo -n $'" . escape(getreg(), "'") . "' | xsel -ib")
+
   set ttymouse=xterm2
   set ttyscroll=100   | " improves speed for terminal vim, incomp. with nvim
   set ttyfast         | " improves speed for terminal vim (incomp. with nvim)
@@ -228,6 +239,7 @@ if !has('nvim')       | " settings which have been removed from neovim
   endif
 endif
 
+
 if has("autocmd")
   set modeline                | " set variables specific to a file, like indentation by adding a comment
   " set default completion function in case YouCompleteMe cannot help
@@ -301,16 +313,6 @@ if has("autocmd")
     "endif
   augroup END
 
-  if has('nvim')
-    autocmd TermOpen term://* set nobuflisted
-    " use default ESC key to leave insert mode in the internal terminal emulator
-    tnoremap <Esc> <C-\><C-n>
-  else
-    augroup vimonly
-      autocmd VimLeave * call system("echo -n $'" . escape(getreg(), "'") . "' | xsel -ib")
-    augroup END
-  endif
-
   " autocmd BufNewFile set nobuflisted
   " use the shada/viminfo file to return the cursor to where it was...
   function! ReturnCursor()