X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=dotfiles%2Fvim%2F.vimrc;h=1e40b8ba977d0a2e443cd5da60d2fb903d95a99d;hb=455842494106c4f7f3906536074ae2d629ed612b;hp=78f58a1b9fd69973bd94f306dbc9fee1382ad724;hpb=799ba44bafe18cf394cf8a59e9fdd0fe7bb6a023;p=shutils.git

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index 78f58a1..1e40b8b 100644
--- a/dotfiles/vim/.vimrc
+++ b/dotfiles/vim/.vimrc
@@ -19,10 +19,8 @@ syntax on
 filetype plugin indent on
 
 set modeline
-set autoindent
-"set tabstop=4
 set number
-set bs=2
+set backspace=indent,eol,start
 
 "vim-7 and newer has vimspell (spell checker) built in
 if version >= 703
@@ -59,10 +57,14 @@ highlight BadWhitespace ctermbg=red guibg=red
 " Make trailing whitespace be flagged as bad.
 au Filetype python,tex,c,cpp,cs,objc,java syn match BadWhitespace /\s\+$/ containedin=ALL
 
-" set list to activate 
 set listchars=tab:»­,trail:·,eol:$
 
 
+set autoindent
+set tabstop=4
+au Filetype python,tex,c,cpp,cs,objc,java :DetectIndent
+"let g:detectindent_preferred_expandtab = 1
+"let g:detectindent_preferred_indent = 4
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -104,7 +106,6 @@ au Filetype c,cpp,cs,objc,java set cindent cst csto=0
 au Filetype c,cpp,cs,objc map <F7> :make <CR>
 au Filetype java map <F7> :!ant -f ../build.xml <CR>
 au Filetype c,cpp,cs,obj set makeprg=make
-au Filetype c,cpp,cs,obj set tabstop=4
 au Filetype c,cpp,cs,obj set shiftwidth=4
 
 
@@ -168,6 +169,10 @@ if version>=700
 	au Filetype mail,text set fo+=n spell
 endif
 
+"Scissor line
+au Filetype mail syn match Statement /^\s*-*\s*>8\s*-*\s*$/
+au Filetype mail syn match Statement /^\s*-*\s*8<\s*-*\s*$/
+
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -218,7 +223,6 @@ let g:LatexBox_latexmk_options="-pvc"
 
 au Filetype tex set smartindent
 
-au Filetype tex set tabstop=4
 au Filetype tex set shiftwidth=4
 
 au Filetype tex map! ,b \begin{}<Esc>i
@@ -246,7 +250,6 @@ au Filetype python map <F5> :!python % <CR>
 
 " Number of spaces that a pre-existing tab is equal to.
 " For the amount of space used for a new tab use shiftwidth.
-au Filetype python set tabstop=4
 au Filetype python set shiftwidth=4
 au Filetype python set expandtab