Changeset 34557 for dotfiles/vim

Timestamp:

07/23/09 11:37:17 (4 years ago)

Author:

from_kyushu

Message:

update NeoComplCache?

Location:

dotfiles/vim/from_kyushu/.vim

Files:

• autoload/neocomplcache.vim (modified) (7 diffs)
• autoload/neocomplcache/snippets_complete.vim (modified) (3 diffs)
• autoload/proc.so (added)
• autoload/proc.vim (modified) (7 diffs)
• plugin/neocomplcache.vim (modified) (2 diffs)

dotfiles/vim/from_kyushu/.vim/autoload/neocomplcache.vim

@@ -2 +2 @@
 " FILE: neocomplcache.vim
 " AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
-" Last Modified: 14 Jun 2009
+" Last Modified: 24 Jun 2009
 " Usage: Just source this file.
 " License: MIT license  {{{
@@ -24 +24 @@
 "     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 " }}}
-" Version: 2.60, for Vim 7.0
+" Version: 2.61, for Vim 7.0
 "=============================================================================
 
@@ -44 +44 @@
     let s:cur_keyword_pos = -1
 
-    if g:NeoComplCache_EnableSkipCompletion
-        let s:prev_input_time = reltime()
-    endif
+    let s:prev_input_time = reltime()
     "}}}
     
@@ -77 +75 @@
     call s:set_keyword_pattern('tex',
                 \'\v\\\a\{\a{1,2}\}?|\\[[:alpha:]@]+[[{]?|\a[[:alnum:]]*[*[{]?')
-    call s:set_keyword_pattern('sh,zsh,vimshell',
+    call s:set_keyword_pattern('sh,zsh',
                 \'\v\$\w+|[[:alpha:]_.-][[:alnum:]_.-]*%(\s*[[(])?')
+    call s:set_keyword_pattern('vimshell',
+                \'\v\$\$?\w*|[[:alpha:]_.-][[:alnum:]_.-]*%(\s*[[(])?')
     call s:set_keyword_pattern('ps1',
                 \'\v\$\w+|[[:alpha:]_.-][[:alnum:]_.-]*%(\s*\(\)?)?')
@@ -400 +400 @@
 " Complete internal functions."{{{
 function! s:complete()"{{{
+    if g:NeoComplCache_EnableSkipCompletion
+        if split(reltimestr(reltime(s:prev_input_time)))[0] < g:NeoComplCache_SkipInputTime
+            echo 'Skipped auto completion'
+            let s:skipped = 1
+
+            let s:prev_input_time = reltime()
+            return
+        endif
+
+        echo ''
+        redraw
+        let s:prev_input_time = reltime()
+    endif
+
     if s:skip_next_complete
         let s:skip_next_complete = 0
@@ -460 +474 @@
             endif
 
+            let s:prev_input_time = reltime()
             return
         endif
@@ -490 +505 @@
     if l:cur_keyword_pos < 0 || len(l:cur_keyword_str) < g:NeoComplCache_KeywordCompletionStartLength
         return
-    endif
-
-    if g:NeoComplCache_EnableSkipCompletion
-        if split(reltimestr(reltime(s:prev_input_time)))[0] < g:NeoComplCache_SkipInputTime
-            echo 'Skipped auto completion'
-            let s:skipped = 1
-
-            return 1
-        else
-            echo ''
-            redraw
-        endif
-        let s:prev_input_time = reltime()
     endif
 

dotfiles/vim/from_kyushu/.vim/autoload/neocomplcache/snippets_complete.vim

@@ -2 +2 @@
 " FILE: snippets_complete.vim
 " AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
-" Last Modified: 30 May 2009
+" Last Modified: 17 Jun 2009
 " Usage: Just source this file.
 " License: MIT license  {{{
@@ -24 +24 @@
 "     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 " }}}
-" Version: 1.16, for Vim 7.0
+" Version: 1.17, for Vim 7.0
 "-----------------------------------------------------------------------------
 " ChangeLog: "{{{
+"   1.17:
+"    - Fixed ATOK X3 on when snippets expanded.
+"
 "   1.16:
 "    - Fixed add rank bug.
@@ -349 +352 @@
         " Return.
         call setpos('.', [0, line('.'), l:match, 0])
+        if has('multi_byte_ime')
+            let &l:iminsert = 0
+        endif
         silent execute "normal! a\<CR>"
 

dotfiles/vim/from_kyushu/.vim/autoload/proc.vim

@@ -1 @@
-" 2006-08-19
+" 2009-05-26
 
 scriptencoding utf-8
@@ -53 +53 @@
 
 function! s:lib.popen2(args)
-  let [pid, fd_stdin, fd_stdout] = self.api.vp_pipe_open(2, s:getfilename(a:args))
+  let [pid, fd_stdin, fd_stdout] = self.api.vp_pipe_open(2, a:args)
   let proc = {}
   let proc.pid = pid
@@ -62 +62 @@
 
 function! s:lib.popen3(args)
-  let [pid, fd_stdin, fd_stdout, fd_stderr] = self.api.vp_pipe_open(3, s:getfilename(a:args))
+  let [pid, fd_stdin, fd_stdout, fd_stderr] = self.api.vp_pipe_open(3, a:args)
   let proc = {}
   let proc.pid = pid
@@ -88 +88 @@
 
 function! s:lib.ptyopen(args)
-  let [pid, fd, ttyname] = self.api.vp_pty_open(&winwidth, &winheight, s:getfilename(a:args))
+  let [pid, fd, ttyname] = self.api.vp_pty_open(&winwidth, &winheight, a:args)
 
   let proc =  self.fdopen(fd, self.api.vp_pty_close, self.api.vp_pty_read, self.api.vp_pty_write)
@@ -95 +95 @@
   return proc
 endfunction
+
 
 
@@ -127 +128 @@
 endfunction
 
-function! s:getfilename(args)
-    let l:PATH_SEPARATOR = (has('win32') || has('win64')) ? '/\\' : '/'
-    let l:pattern = printf('[/~]\?\f\+[%s]\f*$', l:PATH_SEPARATOR)
-    if a:args[0] =~ l:pattern
-        let l:args = a:args
-    else
-        " Command search.
-        if has('win32') || has('win64')
-            let l:path = substitute($PATH, '\\\?;', ',', 'g')
-            for ext in ['', '.bat', '.cmd', '.exe']
-                let l:files = globpath(l:path, a:args[0].ext)
-                if !empty(l:files)
-                    break
-                endif
-            endfor
-            let l:args = insert(a:args[1:], split(l:files, '\n')[0])
-        else
-            let l:path = substitute($PATH, '/\?:', ',', 'g')
-            let l:args = insert(a:args[1:], split(globpath(l:path, a:args[0]), '\n')[0])
-        endif
-    endif
-
-    " Convert encoding for system().
-    if has('win32') || has('win64')
-        return map(l:args, "iconv(v:val, &encoding, 'cp932')")
-    else
-        return map(l:args, "iconv(v:val, &encoding, 'utf-8')")
-    endif
-endfunction
+
 
 "-----------------------------------------------------------
@@ -238 +211 @@
 function! s:lib.api.vp_pipe_open(npipe, argv)
   if has("win32")
-    let cmdline = ''
+    let cmdline = ""
     for arg in a:argv
-      let cmdline .= '"' . substitute(arg, '"', '\\"', 'g') . '" '
+      let cmdline .= '"' . substitute(arg, '"', '""', 'g') . '" '
     endfor
     let [pid; fdlist] = self.libcall("vp_pipe_open", [a:npipe, cmdline])

dotfiles/vim/from_kyushu/.vim/plugin/neocomplcache.vim

@@ -2 +2 @@
 " FILE: neocomplcache.vim
 " AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
-" Last Modified: 14 Jun 2009
+" Last Modified: 17 Jun 2009
 " Usage: Just source this file.
 " License: MIT license  {{{
@@ -24 +24 @@
 "     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 " }}}
-" Version: 2.60, for Vim 7.0
+" Version: 2.61, for Vim 7.0
 "-----------------------------------------------------------------------------
 " ChangeLog: "{{{
 " ChangeLog NeoComplCache2: "{{{
+"   2.61:
+"    - Fixed ATOK X3 on when snippets expanded.
+"    - Improved vimshell syntax.
+"    - Improved skip completion.
+"
 "   2.60: Improved filename completion.
 "    - Improved long filename view.