differnt font size for diff and 'normal' gvim

diff --git a/vimrc b/vimrc
index d57fb366fbab172cd136a21af7fac37001da56dc..90ef2f81ebc49dc3fdca4147ef507bb65d10fde6 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -105,6 +105,7 @@ nnoremap <Leader>= msgg=G`s
 inoremap kj <Esc>
 inoremap jk <Esc>
 inoremap ts<tab> // TODOts: <Esc>=$A
+inoremap obs<tab> /// <para><CR> OBSOLETE kann nach der Abspaltung von 1.12 entfernt werden<CR><Esc>=$A
 inoremap no<tab> <Esc>0i <nodoc /><Esc>0i///<Esc>=$
 inoremap td<tab> <Esc>0i//TODOts: doku<CR><summary> </summary><Esc>0i/// <Esc>kVj=$
 
@@ -208,10 +209,19 @@ if &diff
     autocmd VimEnter *  syntax off
     autocmd VimEnter * set guioptions+=b
     set relativenumber!
+    set guifont=DejaVu_Sans_Mono:h10:cANSI:qDRAFT
     set number
 else
     if has("gui_running")
         set lines=999 columns=120
+        set guifont=DejaVu_Sans_Mono:h12:cANSI:qDRAFT
+        "    if has("gui_macvim")
+        "        set guifont=Menlo\ Regular:h14
+        "    elseif has("gui_win32")
+        "        set guifont=Consolas:h11:cANSI
+        "    else
+        "        set guifont=Inconsolata\ 12
+        "    endif
     endif
     " from /etc/vim/vimrc (restore last editing position)
     if has("autocmd")
@@ -239,15 +249,6 @@ autocmd GuiEnter * simalt ~x
 set t_ut=
 
 
-if has("gui_running")
-    if has('win32')
-        set guifont=Consolas:h10:cANSI:qDRAFT
-    else
-        set guifont=Monospace\ 12
-    endif
-endif
-
-
 if has ('win32') || has('win32unix')
     let g:vimwiki_list = [
                 \{