Cursor lines

diff --git a/gvimrc b/gvimrc
index 21da869cc6bb19d6e9e8ff9e10bb6508c7ca8824..66b9aa1b9e553e3df1472e0d4325f09028ccfbae 100644 (file)
--- a/gvimrc
+++ b/gvimrc
@@ -1,46 +1,48 @@
-\r
-" Use :help 'option' to see the documentation for the given option.\r
-\r
-set guioptions+=a\r
-set guioptions=egmrti\r
-set guioptions-=m "no menu bar\r
-set guioptions-=T "no toolbar\r
-set guioptions-=r "no scroolbar\r
-set noguipty\r
-\r
-" mouse\r
-set mousemodel=popup\r
-set mousehide\r
-set mouse=a\r
-\r
-\r
-" mapping\r
-map <S-Insert> <MiddleMouse>\r
-map! <S-Insert> <MiddleMouse>\r
-\r
-" colors\r
-highlight normal guibg=black guifg=white\r
-highlight linenr guifg=grey\r
-highlight BadWhitespace guifg=red\r
-\r
-set gcr=a:blinkon0\r
-\r
-" fonts\r
-set guifont=Monospace\ 10\r
-if has("mac")\r
-"  set guifont=Menlo:h12\r
-  set guifont=monaco:h11\r
-elseif has("unix")\r
-"  set guifont=-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1\r
-  set guifont=inconsolata\ 11\r
-elseif has("win32")\r
-"  set guifont=consolas:h11,courier\ new:h10\r
-  set guifont=consolas:h10:cANSI:qDRAFT\r
-endif\r
-\r
-" help\r
-if has("win32")\r
-  let winhelpfile='windows.hlp'\r
-  map K :execute "!start winhlp32 -k <cword> " . winhelpfile <CR>\r
-endif\r
-\r
+
+" Use :help 'option' to see the documentation for the given option.
+
+set guioptions+=a
+set guioptions=egmrti
+set guioptions-=m "no menu bar
+set guioptions-=T "no toolbar
+set guioptions-=r "no scroolbar
+set noguipty
+
+" mouse
+set mousemodel=popup
+set mousehide
+set mouse=a
+
+
+" mapping
+map <S-Insert> <MiddleMouse>
+map! <S-Insert> <MiddleMouse>
+
+" colors
+highlight normal guibg=black guifg=white
+highlight linenr guifg=grey
+highlight BadWhitespace guifg=red
+highlight Cursorline guibg=darkgrey
+highlight Cursorcolumn guibg=darkgrey
+
+set gcr=a:blinkon0
+
+" fonts
+set guifont=Monospace\ 10
+if has("mac")
+"  set guifont=Menlo:h12
+  set guifont=monaco:h11
+elseif has("unix")
+"  set guifont=-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
+  set guifont=inconsolata\ 11
+elseif has("win32")
+"  set guifont=consolas:h11,courier\ new:h10
+  set guifont=consolas:h10:cANSI:qDRAFT
+endif
+
+" help
+if has("win32")
+  let winhelpfile='windows.hlp'
+  map K :execute "!start winhlp32 -k <cword> " . winhelpfile <CR>
+endif
+

diff --git a/vimrc b/vimrc
index 6b029db6a0f0fd2287f760ae5dc5240f536f8ef7..4bd39f69ab918c4ff1962692f2333324fd6ddd43 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -22,6 +22,7 @@ set incsearch
 set hlsearch
 set ignorecase
 set smartcase
+set magic
 set showmatch
 set complete-=i
 set virtualedit=block
@@ -42,11 +43,7 @@ set titlestring=%F
 set matchtime=2
 
 " folding
-set foldmethod=syntax
-set foldlevelstart=10
-set foldnestmax=10
-set foldopen+=search
-set foldclose=all
+set foldmethod=indent
 
 " keyboard
 set backspace=indent,eol,start
@@ -110,6 +107,10 @@ set background=dark
 highlight linenr ctermfg=grey
 highlight BadWhitespace ctermfg=red
 match BadWhitespace /\s\+$/
+highlight Cursorline ctermbg=darkgrey
+highlight Cursorcolumn ctermbg=darkgrey
+set cursorline
+set cursorcolumn
 
 " fonts and chars
 set list
@@ -118,7 +119,6 @@ if has('multi_byte') && &encoding ==# 'utf-8'
 else
   let &listchars = 'tab:> ,extends:>,precedes:<,nbsp:.'
 endif
-set cursorline
 let &t_ti.="\e[1 q"
 let &t_SI.="\e[5 q"
 let &t_EI.="\e[1 q"