# HG changeset patch
# User Tomas Zeman <tzeman@volny.cz>
# Date 1304405678 -7200
# Node ID 9a8b8e87b12e2e10d968759505cb50eaebbb9236
# Parent  186c5b1022aa27c8ec763481af7e3ce8831e8559
vimrc -> .vimrc + cleanup

diff -r 186c5b1022aa -r 9a8b8e87b12e config/.vimrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/.vimrc	Tue May 03 08:54:38 2011 +0200
@@ -0,0 +1,46 @@
+
+" Use Vim settings, rather then Vi settings (much better!).
+" This must be first, because it changes other options as a side effect.
+set nocompatible
+
+set bs=2		" allow backspacing over everything in insert mode
+set ai			" always set autoindenting on
+if has("vms")
+  set nobackup		" do not keep a backup file, use versions instead
+else
+  set backup		" keep a backup file
+endif
+set viminfo='20,\"50	" read/write a .viminfo file, don't store more
+			" than 50 lines of registers
+set history=50		" keep 50 lines of command line history
+set ruler		" show the cursor position all the time
+
+" Don't use Ex mode, use Q for formatting
+map Q gq
+
+" Make p in Visual mode replace the selected text with the "" register.
+vnoremap p <Esc>:let current_reg = @"<CR>gvdi<C-R>=current_reg<CR><Esc>
+
+" Switch syntax highlighting on, when the terminal has colors
+" Also switch on highlighting the last used search pattern.
+if &t_Co > 2 || has("gui_running")
+  syntax on
+  set hlsearch
+endif
+
+" Only do this part when compiled with support for autocommands.
+if has("autocmd")
+ " In text files, always limit the width of text to 78 characters
+ autocmd BufRead *.txt set tw=78
+endif " has("autocmd")
+
+set encoding=utf8
+set background=dark
+set number
+set hidden
+colorscheme desert
+set exrc
+set secure
+let g:proj_flags="imstbvSc"
+nmap <silent> <Leader>p <Plug>ToggleProject
+
diff -r 186c5b1022aa -r 9a8b8e87b12e config/vimrc
--- a/config/vimrc	Fri Feb 18 09:58:52 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-" An example for a vimrc file.
-"
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2000 Oct 14
-"
-" To use it, copy it to
-"     for Unix and OS/2:  ~/.vimrc
-"	      for Amiga:  s:.vimrc
-"  for MS-DOS and Win32:  $VIM\_vimrc
-"	    for OpenVMS:  sys$login:.vimrc
-
-" Use Vim settings, rather then Vi settings (much better!).
-" This must be first, because it changes other options as a side effect.
-set nocompatible
-
-set bs=2		" allow backspacing over everything in insert mode
-set ai			" always set autoindenting on
-if has("vms")
-  set nobackup		" do not keep a backup file, use versions instead
-else
-  set backup		" keep a backup file
-endif
-set viminfo='20,\"50	" read/write a .viminfo file, don't store more
-			" than 50 lines of registers
-set history=50		" keep 50 lines of command line history
-set ruler		" show the cursor position all the time
-
-" For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries
-" let &guioptions = substitute(&guioptions, "t", "", "g")
-
-" Don't use Ex mode, use Q for formatting
-map Q gq
-
-" Make p in Visual mode replace the selected text with the "" register.
-vnoremap p <Esc>:let current_reg = @"<CR>gvdi<C-R>=current_reg<CR><Esc>
-
-" Switch syntax highlighting on, when the terminal has colors
-" Also switch on highlighting the last used search pattern.
-if &t_Co > 2 || has("gui_running")
-  syntax on
-  set hlsearch
-endif
-
-" Only do this part when compiled with support for autocommands.
-if has("autocmd")
- " In text files, always limit the width of text to 78 characters
- autocmd BufRead *.txt set tw=78
-endif " has("autocmd")
-
-set encoding=utf8
-set background=dark
-set number
-set hidden
-colorscheme desert
-set exrc
-set secure
-let g:proj_flags="imstbvSc"
-nmap <silent> <Leader>p <Plug>ToggleProject
-