Permalink
Browse files

Merge vimrc changes.

  • Loading branch information...
1 parent ce4c534 commit 67fa54b078407edb7c41d4a549e07b9a20a64a60 @xbot committed May 8, 2012
Showing with 8 additions and 2 deletions.
  1. +8 −2 vimrc
View
10 vimrc
@@ -224,6 +224,7 @@ let g:neocomplcache_enable_smart_case = 1
let g:neocomplcache_enable_camel_case_completion = 1
let g:neocomplcache_enable_underbar_completion = 1
let g:neocomplcache_cursor_hold_i_time=10000
+let g:neocomplcache_plugin_rank={}
" SuperTab Settings
let g:SuperTabDefaultCompletionType = '<C-X><C-U>'
@@ -300,7 +301,7 @@ let ub_hotkey_open_item_in_tabbed_view = '<c-enter>'
let ub_hotkey_delete_item = '<del>'
let ub_hotkey_pagedown = '<pagedown>'
let ub_hotkey_pageup = '<pageup>'
-let ub_hotkey_save_current_item='<leader>w'
+let ub_hotkey_save_current_item = '<leader>w'
let ub_tmpl_img_url = '<a href="%(url)s"><img src="%(url)s"></a>'
let ub_socket_timeout = 30
if gbl_ultrablog_debug == 1
@@ -347,6 +348,11 @@ au BufNewFile,BufRead *.lib,*.inc set filetype=php
au FileType php set complete+=k,set dict=$VIMRUNTIME/api/php.dict
au FileType php set keywordprg="help"
au FileType php set iskeyword=@,48-57,_,128-167,224-235
+if IsPlatform('win')
+ au FileType php set runtimepath+=$VIM\php
+else
+ au FileType php set runtimepath+=~/.vim/api/php
+endif
" Javascript filetype
au FileType javascript call JavaScriptFold()
@@ -855,7 +861,7 @@ function! SaveNOEOF()
endfunction
command! -complete=file -nargs=0 SaveNOEOF :call SaveNOEOF()
command! -complete=file -nargs=1 SaveAsNOEOF :call SaveAsNOEOF(<q-args>)
-"autocmd! BufWriteCmd */turbocrm*,version*.txt call SaveNOEOF()
+autocmd! BufWriteCmd */turbocrm*,version*.txt,*/CRM7_VOB/* call SaveNOEOF()
" Set the current buffer to use utf-8 encoding and unix format
function! SetUnixFF()

0 comments on commit 67fa54b

Please sign in to comment.