vimdiff shortcuts added and support for CTRL+Shift+LeftArrow...

1 files changed, 4 insertions, 1 deletions

diff --git a/vimrc b/vimrc
index d66c1ba..bbf0f03 100644
--- a/vimrc
+++ b/vimrc
@@ -28,9 +28,11 @@ let g:ycm_autoclose_preview_window_after_insertion=1  | " close the window when
 "let g:ycm_semantic_triggers = {'c' : ['(', ',']}     | " add additional triggers (not recommend)
 
 let b:html_omni_flavor='xhtml'                        | " prever xhtml over html because that makes inline php code possible without hassle
+let html_use_css = 1                                  | " when using :TOhtml no font-tags will be used, but proper css
 
 call vundle#end()             | " required by Vundle
 filetype plugin indent on     | " required by Vundle
+behave mswin
 "================================================================================ 
 " custom config
 colorscheme coderonline
@@ -45,6 +47,7 @@ set ts=2 sts=2 sw=2 expandtab | " indentation which i like (abbr: tabstop, softt
 set autoindent                | " always set autoindenting on
 set copyindent                | " copy the previous indentation on autoindenting
 set scrolloff=2               | " always keeps at least two lines visible (when seeking)
+set selectmode=key,mouse      | " make [strg+]shift-{left|right} enter SELECT mode (windows alike)
 
 set whichwrap=b,s,<,>,[,]     | " beyond beginning/end line causes cusor to wrap
 set backspace=indent,eol,start| " allow backspacing over everything in insert mode, not needed with whichwrap
@@ -68,8 +71,8 @@ set clipboard=unnamedplus     | " makes copy and paste work (autoselectplus migh
 set number                    | " toggle line numbers
 
 if has("multi_byte")
-  scriptencoding utf-8        | " tell vim that we are using utf-8 here
   set encoding=utf-8          | " we need default utf-8 encoding to use cool chars as line break and so on (see below)
+  scriptencoding utf-8        | " tell vim that we are using utf-8 here
   set showbreak+=›            | " symbol used in the beginning of a wrapped line
   set listchars=eol:↲         | " symbols used when using :set list (which displays non-printable chars)
   set listchars+=trail:·      | " symbols used when using :set list (which displays non-printable chars)