diff --git a/.vimrc b/.vimrc index 2027b0c..91e9912 100644 --- a/.vimrc +++ b/.vimrc @@ -38,7 +38,7 @@ " Always switch to the current file directory set shortmess+=filmnrxoOtT " Abbrev. of messages (avoids 'hit enter') - set viewoptions=folds,options,cursor,unix,slash " Better Unix / Windows compatibility + " set viewoptions=folds,options,cursor,unix,slash " Better Unix / Windows compatibility set virtualedit=onemore " Allow for cursor beyond last character set history=1000 " Store a ton of history (default is 20) set hidden " Allow buffer switching without saving @@ -170,18 +170,7 @@ set foldmethod=syntax autocmd FileType python set foldmethod=indent - set nofoldenable - " Code folding options - nmap f0 :set foldlevel=0 - nmap f1 :set foldlevel=1 - nmap f2 :set foldlevel=2 - nmap f3 :set foldlevel=3 - nmap f4 :set foldlevel=4 - nmap f5 :set foldlevel=5 - nmap f6 :set foldlevel=6 - nmap f7 :set foldlevel=7 - nmap f8 :set foldlevel=8 - nmap f9 :set foldlevel=9 + "set nofoldenable " Find merge conflict markers map fc /\v^[<\|=>]{7}( .*\|$)