projects
/
shutils.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vimrc: update tabstop settings
[shutils.git]
/
dotfiles
/
vim
/
.vimrc
diff --git
a/dotfiles/vim/.vimrc
b/dotfiles/vim/.vimrc
index 54f8399206dde4032abbd029163835e246a12d2b..10dd903ac3aaf3cb1c7d20fa2bab2386ddae0ee0 100644
(file)
--- a/
dotfiles/vim/.vimrc
+++ b/
dotfiles/vim/.vimrc
@@
-8,18
+8,19
@@
"option and setting.
"option and setting.
+" Pathogen runtime path manipulation
+"call pathogen#infect() "Using the infect method breaks ft detection
+call pathogen#runtime_append_all_bundles()
+
+"Activate syntax highlighting
+syntax on
"Activate filetype plugins: syntax highlighting, indentation, and more
"Activate filetype plugins: syntax highlighting, indentation, and more
-filetype plugin on
-filetype indent on
-filetype on
+filetype plugin indent on
set modeline
set modeline
-
-set autoindent
-"set tabstop=4
set number
set number
-set b
s=2
+set b
ackspace=indent,eol,start
"vim-7 and newer has vimspell (spell checker) built in
if version >= 703
"vim-7 and newer has vimspell (spell checker) built in
if version >= 703
@@
-39,9
+40,6
@@
set incsearch
set hlsearch
set hlsearch
-"Activate syntax highlighting
-syntax on
-
"Power saving tip: powertop-homepage
let &guicursor = &guicursor . ",a:blinkon0"
"According to vim help -- enable mouse in xterm...
"Power saving tip: powertop-homepage
let &guicursor = &guicursor . ",a:blinkon0"
"According to vim help -- enable mouse in xterm...
@@
-59,12
+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
" 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 listchars=tab:»,trail:·,eol:$
-" Pathogen runtime path manipulation
-call pathogen#infect()
+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
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@
-106,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,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
au Filetype c,cpp,cs,obj set shiftwidth=4
@@
-220,7
+219,6
@@
let g:LatexBox_latexmk_options="-pvc"
au Filetype tex set smartindent
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
au Filetype tex set shiftwidth=4
au Filetype tex map! ,b \begin{}<Esc>i
@@
-248,7
+246,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.
" 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
au Filetype python set shiftwidth=4
au Filetype python set expandtab