Update of /cvsroot/icomplete/icomplete
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18744
Modified Files:
AUTHORS ChangeLog cppcomplete.vim icomplete.vim
Log Message:
probably last checkin, automatic completions for . and ->
Index: ChangeLog
===================================================================
RCS file: /cvsroot/icomplete/icomplete/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ChangeLog 4 Jul 2007 10:59:10 -0000 1.6
--- ChangeLog 1 Nov 2007 17:30:57 -0000 1.7
***************
*** 1,2 ****
--- 1,5 ----
+ Nov 01, 2007:
+ * IMPORTANT: Last and final release of icomplete, use OmniCppComplete in future
+ * autocompletion on . or -> (patch by Sanjaya Karunase)
* add ability to change name of .icomplete_taglist (Tim Murison)
* fixed some segfaults (thanks Johannes Winkelmann)
Index: cppcomplete.vim
===================================================================
RCS file: /cvsroot/icomplete/icomplete/cppcomplete.vim,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cppcomplete.vim 4 Aug 2006 23:11:43 -0000 1.3
--- cppcomplete.vim 1 Nov 2007 17:30:57 -0000 1.4
***************
*** 5,9 ****
" This function is used for the 'omnifunc' option.
! function! cppcomplete#Complete(findstart, base)
if a:findstart
let line = getline('.')
--- 5,10 ----
" This function is used for the 'omnifunc' option.
! function! cppcomplete#CompleteMain(findstart, base)
!
if a:findstart
let line = getline('.')
***************
*** 49,65 ****
endif
- " check if set g:cppcomplete_listfile
- if exists('g:cppcomplete_listfile')
- let s:listfileparam = " --listfile=" . g:cppcomplete_listfile
- else
- let s:listfileparam = ""
- endif
-
" call icomplete and store the result in the array
" java and c# users must build their tags file manually
if &ft == "java" || &ft == "cs"
! let cmd = "icomplete --cache=0 -c " . s:cppcomplete_col . " -l " . s:cppcomplete_line . s:tagparam . " " . s:listfileparam . " " . s:cppcomplete_tmpfile
else
! let cmd = "icomplete --cache=1 -c " . s:cppcomplete_col . " -l " . s:cppcomplete_line . s:tagparam . " " . s:listfileparam . " " . s:cppcomplete_tmpfile
endif
--- 50,59 ----
endif
" call icomplete and store the result in the array
" java and c# users must build their tags file manually
if &ft == "java" || &ft == "cs"
! let cmd = "icomplete --cache=0 -c " . s:cppcomplete_col . " -l " . s:cppcomplete_line . s:tagparam . " " . s:cppcomplete_tmpfile
else
! let cmd = "icomplete --cache=1 -c " . s:cppcomplete_col . " -l " . s:cppcomplete_line . s:tagparam . " " . s:cppcomplete_tmpfile
endif
***************
*** 94,95 ****
--- 88,121 ----
endfunc
+
+ function! cppcomplete#Complete()
+ let omni_mapping = "\<C-X>\<C-O>"
+ return omni_mapping
+ endfunc
+
+ function! cppcomplete#CompleteDot()
+ return '.' . cppcomplete#Complete()
+ endfunc
+
+ function! cppcomplete#CompleteArrow()
+ let index = col('.') - 2
+ if index >= 0
+ let char = getline('.')[index]
+ if char == '-'
+ return '>' . cppcomplete#Complete()
+ endif
+ endif
+ return '>'
+ endfunc
+
+ function! cppcomplete#CompleteColon()
+ let index = col('.') - 2
+ if index >= 0
+ let char = getline('.')[index]
+ if char == ':'
+ return ':' . cppcomplete#Complete()
+ endif
+ endif
+ return ':'
+ endfunc
+
Index: AUTHORS
===================================================================
RCS file: /cvsroot/icomplete/icomplete/AUTHORS,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AUTHORS 4 Aug 2006 23:11:43 -0000 1.4
--- AUTHORS 1 Nov 2007 17:30:57 -0000 1.5
***************
*** 12,15 ****
--- 12,16 ----
- Johannes Winkelmann
- Tim Murison
+ - Sanjaya Karunase
Donators:
Index: icomplete.vim
===================================================================
RCS file: /cvsroot/icomplete/icomplete/icomplete.vim,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** icomplete.vim 19 Nov 2005 17:25:37 -0000 1.1.1.1
--- icomplete.vim 1 Nov 2007 17:30:57 -0000 1.2
***************
*** 9,14 ****
end
- " Only do this part when compiled with support for autocommands.
if has("autocmd")
! autocmd Filetype cpp,c,java,cs set omnifunc=cppcomplete#Complete
endif
--- 9,18 ----
end
if has("autocmd")
! autocmd FileType cpp,c set omnifunc=cppcomplete#CompleteMain
! autocmd FileType cpp,c inoremap <expr> <C-X><C-O> cppcomplete#Complete()
! autocmd FileType cpp,c inoremap <expr> . cppcomplete#CompleteDot()
! autocmd FileType cpp,c inoremap <expr> > cppcomplete#CompleteArrow()
! autocmd FileType cpp,c inoremap <expr> : cppcomplete#CompleteColon()
endif
+
|
