gistfile1.txt

--- clang_complete.vim	Sun Jul 10 11:36:36 2011
+++ clang_complete_.vim	Sun Jul 10 13:44:20 2011
@@ -131,7 +131,6 @@
     let g:clang_complete_lib_flags += 2
   endif
 
-  setlocal completefunc=ClangComplete
   setlocal omnifunc=ClangComplete
 
   if g:clang_periodic_quickfix == 1
@@ -586,9 +585,9 @@
   let l:result = ""
   if s:ShouldComplete()
     if match(&completeopt, 'longest') != -1
-      let l:result = "\<C-X>\<C-U>"
+      let l:result = "\<C-X>\<C-O>"
     else
-      let l:result = "\<C-X>\<C-U>\<C-P>"
+      let l:result = "\<C-X>\<C-O>\<C-P>"
     endif
     if g:clang_auto_select == 1
       let l:result .= "\<C-R>=(pumvisible() ? \"\\<Down>\" : '')\<CR>"