- Improved open behaivior.

- Fixed completion column bug.
- Implemented <Plug>(vimshell_move_end_argument).
- Fixed environment variables parse bug.

Author: Shougo

Rakefile

@@ -1,3 +1,6 @@
+pwd = ENV["PWD"]       
+$HOME = ENV["HOME"]
+
 VIMSHELL_TARGETS = %w[
   autoload/proc.vim
   autoload/vimshell

autoload/vimshell.vim

@@ -2,7 +2,7 @@
 " FILE: vimshell.vim
 " AUTHOR: Janakiraman .S <[email protected]>(Original)
 "         Shougo Matsushita <[email protected]>(Modified)
-" Last Modified: 13 Sep 2009
+" Last Modified: 05 Oct 2009
 " Usage: Just source this file.
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
@@ -24,7 +24,7 @@
 "     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 "     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 " }}}
-" Version: 5.34, for Vim 7.0
+" Version: 5.35, for Vim 7.0
 "=============================================================================
 
 if !exists('g:VimShell_UserPrompt')

autoload/vimshell/complete.vim

@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: complete.vim
 " AUTHOR: Shougo Matsushita <[email protected]>(Modified)
-" Last Modified: 13 Sep 2009
+" Last Modified: 19 Sep 2009
 " Usage: Just source this file.
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
@@ -64,10 +64,8 @@ function! vimshell#complete#insert_command_completion()"{{{
     let &iminsert = 0
     let &imsearch = 0
 
-    let l:save_ve = &l:virtualedit
-    setlocal virtualedit=all
-    let l:cur_text = substitute(getline('.')[: virtcol('.')-1], '^' . g:VimShell_Prompt . '\s*', '', '')
-    let &l:virtualedit = l:save_ve
+    let l:cur_text = (col('.') < 2)? '' : getline('.')[: col('.')-2]
+    let l:cur_text = substitute(l:cur_text, '^' . g:VimShell_Prompt . '\s*', '', '')
     if l:cur_text =~ '^.\+/\|^[^\\]\+\s'
         " Filename completion.
         if exists(':NeoComplCacheDisable') && exists('*neocomplcache#manual_filename_complete')
@@ -91,10 +89,7 @@ endfunction"}}}
 function! vimshell#complete#smart_omni_completion(findstart, base)"{{{
     if a:findstart
         " Get cursor word.
-        let l:save_ve = &l:virtualedit
-        setlocal virtualedit=all
-        let l:cur_text = getline('.')[: virtcol('.')-1]
-        let &l:virtualedit = l:save_ve
+        let l:cur_text = (col('.') < 2)? '' : getline('.')[: col('.')-2]
 
         return match(l:cur_text, '\%([[:alnum:]_+~-]\|\\[ ]\)*$')
     endif

autoload/vimshell/internal/open.vim

@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: open.vim
 " AUTHOR: Shougo Matsushita <[email protected]>
-" Last Modified: 13 Sep 2009
+" Last Modified: 14 Sep 2009
 " Usage: Just source this file.
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
@@ -23,9 +23,11 @@
 "     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 "     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 " }}}
-" Version: 1.0, for Vim 7.0
+" Version: 1.1, for Vim 7.0
 "-----------------------------------------------------------------------------
 " ChangeLog: "{{{
+"   1.1: Improved behaivior.
+"
 "   1.0: Initial version.
 ""}}}
 "-----------------------------------------------------------------------------
@@ -39,15 +41,10 @@
 
 function! vimshell#internal#open#execute(program, args, fd, other_info)"{{{
     " Open file.
-    if g:VimShell_EnableInteractive
-        let l:command = 'exe'
-    else
-        let l:command = 'sexe'
-    endif
 
     if has('win32') || has('win64')
-        let l:command = 'gexe'
-        let l:args = a:args
+        execute printf('silent ! start %s', join(a:args))
+        return 0
     elseif has('mac')
         let l:args = ['open'] + a:args
     elseif executable(vimshell#getfilename('gnome-open'))
@@ -58,6 +55,6 @@ function! vimshell#internal#open#execute(program, args, fd, other_info)"{{{
         throw 'open: Not supported.'
     endif
 
-    return vimshell#execute_internal_command(l:command, l:args, a:fd, a:other_info)
+    return vimshell#execute_internal_command('gexe', l:args, a:fd, a:other_info)
 endfunction"}}}
 

autoload/vimshell/parser.vim

@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: parser.vim
 " AUTHOR: Shougo Matsushita <[email protected]>(Modified)
-" Last Modified: 12 Sep 2009
+" Last Modified: 08 Oct 2009
 " Usage: Just source this file.
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
@@ -342,9 +342,9 @@ function! s:parse_variables(script)"{{{
     while l:i < l:max
         if a:script[l:i] == '$'
             " Eval variables.
-            if match(a:script, '^$\l', l:i)
+            if match(a:script, '^$\l', l:i) >= 0
                 let l:script .= string(eval(printf("b:vimshell_variables['%s']", matchstr(a:script, '^$\zs\l\w*', l:i))))
-            elseif match(a:script, '^$$', l:i)
+            elseif match(a:script, '^$$', l:i) >= 0
                 let l:script .= string(eval(printf("b:vimshell_system_variables['%s']", matchstr(a:script, '^$$\zs\h\w*', l:i))))
             else
                 let l:script .= string(eval(matchstr(a:script, '^$\h\w*', l:i)))

ftplugin/vimshell.vim

@@ -14,6 +14,8 @@ nmap <buffer> <C-n> <Plug>(vimshell_next_prompt)
 nmap <buffer> <C-d> <Plug>(vimshell_delete_previous_output)
 " Paste this prompt.
 nmap <buffer> <C-y> <Plug>(vimshell_paste_prompt)
+" Search end argument.
+nmap <buffer> E <Plug>(vimshell_move_end_argument)
 "}}}
 
 " Insert mode key-mappings."{{{

plugin/vimshell.vim

@@ -2,7 +2,7 @@
 " FILE: vimshell.vim
 " AUTHOR: Janakiraman .S <[email protected]>(Original)
 "         Shougo Matsushita <[email protected]>(Modified)
-" Last Modified: 14 Sep 2009
+" Last Modified: 22 Sep 2009
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
 "     a copy of this software and associated documentation files (the
@@ -23,13 +23,16 @@
 "     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 "     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 " }}}
-" Version: 5.34, for Vim 7.0
+" Version: 5.35, for Vim 7.0
 "=============================================================================
 
 if exists('g:loaded_vimshell') || v:version < 700
   finish
 endif
 
+let s:save_cpo = &cpo
+set cpo&vim
+
 " Plugin keymapping"{{{
 nnoremap <silent> <Plug>(vimshell_split_switch)  :<C-u>call vimshell#switch_shell(1)<CR>
 nnoremap <silent> <Plug>(vimshell_split_create)  :<C-u>call vimshell#create_shell(1)<CR>
@@ -40,6 +43,7 @@ nnoremap <silent> <Plug>(vimshell_previous_prompt)  :<C-u>call vimshell#previous
 nnoremap <silent> <Plug>(vimshell_next_prompt)  :<C-u>call vimshell#next_prompt()<CR>
 nnoremap <silent> <Plug>(vimshell_delete_previous_output)  :<C-u>call vimshell#delete_previous_output()<CR>
 nnoremap <silent> <Plug>(vimshell_paste_prompt)  :<C-u>call vimshell#paste_prompt()<CR>
+nnoremap <silent> <Plug>(vimshell_move_end_argument) 0:<C-u>call search('\\\@<!\s\zs[^[:space:]]*$', '', line('.'))<CR>
 
 inoremap <silent> <Plug>(vimshell_push_current_line)  <ESC>:<C-u>call vimshell#push_current_line()<CR>
 inoremap <silent> <Plug>(vimshell_insert_last_word)  <ESC>:<C-u>call vimshell#insert_last_word()<CR>
@@ -119,6 +123,9 @@ command! -nargs=0 VimShell call vimshell#switch_shell(0)
 command! -nargs=+ -complete=shellcmd VimShellExecute call vimshell#internal#bg#vimshell_bg(split(<q-args>))
 command! -nargs=+ -complete=shellcmd VimShellInteractive call vimshell#internal#iexe#vimshell_iexe(split(<q-args>))
 
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
 let g:loaded_vimshell = 1
 
 " vim: foldmethod=marker