various vim[perator] improvements

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/vim/syntax/c.vim b/vim/syntax/c.vim
index 17b045e..734f156 100644 (file)
--- a/vim/syntax/c.vim
+++ b/vim/syntax/c.vim
@@ -1,5 +1,5 @@
 
-syn keyword cOperator  ssizeof fieldsizeof countof assert offsetof fieldtypeof
+syn keyword cOperator  ssizeof fieldsizeof countof assert offsetof fieldtypeof bitsizeof
 syn keyword cStatement p_delete p_new p_new_raw p_clear p_realloc
 syn keyword cStatement mp_delete mp_new mp_new_raw
 syn keyword cStatement p_dup p_dupstr p_dupz
@@ -8,10 +8,10 @@ syn keyword isGlobal   _G
 syn match   isGlobal "\<[a-zA-Z_][a-zA-Z0-9_]*_g\>"
 
 syn keyword cType byte
-syn match cType "\<[a-zA-Z_][a-zA-Z0-9_]*_[ft]\>"
 syn match cType "\<[a-zA-Z_][a-zA-Z0-9_]*_\(array\|vector\|htbl\|ring\|set\)\>"
 syn match cFunction "\<\([a-z][a-zA-Z0-9_]*\|[a-zA-Z_][a-zA-Z0-9_]*[a-z][a-zA-Z0-9_]*\)\> *("me=e-1
 syn match Function "\$\<\([a-z][a-zA-Z0-9_]*\|[a-zA-Z_][a-zA-Z0-9_]*[a-z][a-zA-Z0-9_]*\)\> *[({]"me=e-1
+syn match cType "\<[a-zA-Z_][a-zA-Z0-9_]*_[ft]\>"
 
 hi def link isGlobal Function
 hi def link cStructure Type

diff --git a/vimperatorrc b/vimperatorrc
index 10c7e29..355e66c 100644 (file)
--- a/vimperatorrc
+++ b/vimperatorrc
@@ -1,5 +1,6 @@
 " 0.5.3 (created: 2007/12/21 19:26:07)
 set showtabline=0
+set guioptions=
 set wim=list:longest,list:full
 set hinttimeout=250
 set activate-=tabopen

diff --git a/vimrc b/vimrc
index 993571b..674805c 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -244,7 +244,7 @@ if has("autocmd")
 
     let ocaml_noindent_let=1
     let git_diff_spawn_mode=2
-    let git_diff_opts = "--patience -C -C -M -B"
+    let git_diff_opts = "--patience -C -C -M"
     let c_gnu=1
     let c_space_errors=1
     let c_no_curly_error=1