Skip to content

Commit 3c0f0c7

Browse files
ShougoShougo
committed
- Improved commands.
- Deleted screen internal command.
1 parent 443cbe8 commit 3c0f0c7

7 files changed

Lines changed: 20 additions & 69 deletions

File tree

‎autoload/vimshell/commands/bg.vim‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"=============================================================================
22
" FILE: bg.vim
33
" AUTHOR: Shougo Matsushita <[email protected]>
4-
" Last Modified: 07 Jul 2010
4+
" Last Modified: 09 Jul 2010
55
" License: MIT license {{{
66
" Permission is hereby granted, free of charge, to any person obtaining
77
" a copy of this software and associated documentation files (the
@@ -103,11 +103,6 @@ augroup vimshell-bg
103103
autocmd!
104104
augroup END
105105

106-
function! vimshell#commands#bg#vimshell_bg(args)"{{{
107-
call vimshell#execute_internal_command('bg', vimshell#parser#split_args(a:args), { 'stdin' : '', 'stdout' : '', 'stderr' : '' },
108-
\ { 'is_interactive' : 0, 'is_split' : 1 })
109-
endfunction"}}}
110-
111106
function! vimshell#commands#bg#init(args, fd, other_info, filetype, interactive)"{{{
112107
" Save current directiory.
113108
let l:cwd = getcwd()

‎autoload/vimshell/commands/iexe.vim‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"=============================================================================
22
" FILE: iexe.vim
33
" AUTHOR: Shougo Matsushita <[email protected]>
4-
" Last Modified: 07 Jul 2010
4+
" Last Modified: 09 Jul 2010
55
" License: MIT license {{{
66
" Permission is hereby granted, free of charge, to any person obtaining
77
" a copy of this software and associated documentation files (the
@@ -162,11 +162,6 @@ endif
162162
call vimshell#set_variables('g:vimshell_interactive_command_options', 'termtter', '--monochrome')
163163
"}}}
164164

165-
function! vimshell#commands#iexe#vimshell_iexe(args)"{{{
166-
call vimshell#execute_internal_command('iexe', vimshell#parser#split_args(a:args), { 'stdin' : '', 'stdout' : '', 'stderr' : '' },
167-
\ { 'is_interactive' : 0, 'is_split' : 1 })
168-
endfunction"}}}
169-
170165
function! s:default_settings()"{{{
171166
" Set environment variables.
172167
let $TERMCAP = 'COLUMNS=' . winwidth(0)

‎autoload/vimshell/commands/screen.vim‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎autoload/vimshell/commands/texe.vim‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"=============================================================================
22
" FILE: texe.vim
33
" AUTHOR: Shougo Matsushita <[email protected]>
4-
" Last Modified: 07 Jul 2010
4+
" Last Modified: 09 Jul 2010
55
" License: MIT license {{{
66
" Permission is hereby granted, free of charge, to any person obtaining
77
" a copy of this software and associated documentation files (the
@@ -126,11 +126,6 @@ endfunction
126126

127127
let s:update_time_save = &updatetime
128128

129-
function! vimshell#commands#texe#vimshell_texe(args)"{{{
130-
call vimshell#execute_internal_command('texe', vimshell#parser#split_args(a:args), { 'stdin' : '', 'stdout' : '', 'stderr' : '' },
131-
\ { 'is_interactive' : 0, 'is_split' : 1 })
132-
endfunction"}}}
133-
134129
function! s:default_settings()"{{{
135130
" Set environment variables.
136131
let $TERMCAP = 'COLUMNS=' . winwidth(0)

‎doc/vimshell.jax‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -577,10 +577,6 @@ pwd *vimshell-internal-pwd*
577577
repeat {cnt} {command} *vimshell-internal-repeat*
578578
{command}を{cnt}回実行します。
579579

580-
screen {command} *vimshell-internal-screen*
581-
{command}をscreen上で実行します。端末の機能を用いるプログラ
582-
ムを起動したいときに便利です。当然Windows上では動作しません。
583-
584580
shell *vimshell-internal-shell*
585581
|:shell|を用いて'shell'を起動します。Windows上のGVimでかつ
586582
|g:vimshell_use_ckw|が設定されている場合、DOSプロンプトでは

‎doc/vimshell.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ CHANGELOG *vimshell-changelog*
196196
- Improved listchars.
197197
- Fixed command line completion.
198198
- Fixed initialize bug.
199+
- Deleted screen internal command.
200+
- Improved commands.
199201

200202
2010-07-07
201203
* Ver.7.1 development is started.

‎plugin/vimshell.vim‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ endif
135135
command! -nargs=? -complete=dir VimShell call vimshell#switch_shell(0, <q-args>)
136136
command! -nargs=? -complete=dir VimShellCreate call vimshell#create_shell(0, <q-args>)
137137
command! -nargs=? -complete=dir VimShellPop call vimshell#switch_shell(1, <q-args>)
138-
command! -nargs=+ -complete=customlist,s:execute_completefunc VimShellExecute call vimshell#commands#bg#vimshell_bg(<q-args>)
139-
command! -nargs=+ -complete=customlist,s:execute_completefunc VimShellInteractive call vimshell#commands#iexe#vimshell_iexe(<q-args>)
140-
command! -nargs=+ -complete=customlist,s:execute_completefunc VimShellTerminal call vimshell#commands#texe#vimshell_texe(<q-args>)
138+
command! -nargs=+ -complete=customlist,s:execute_completefunc VimShellExecute call s:vimshell_execute(<q-args>)
139+
command! -nargs=+ -complete=customlist,s:execute_completefunc VimShellInteractive call s:vimshell_interactive(<q-args>)
140+
command! -nargs=+ -complete=customlist,s:execute_completefunc VimShellTerminal call s:vimshell_terminal(<q-args>)
141141
command! -nargs=+ -complete=customlist,s:execute_completefunc VimShellBang call s:bang(<q-args>)
142142
command! -nargs=+ -complete=customlist,s:execute_completefunc VimShellRead call s:read(<q-args>)
143143

@@ -161,6 +161,18 @@ function! s:execute_completefunc(lead, cmd, pos)"{{{
161161
silent! let keys = vimshell#complete#vimshell_execute_complete#completefunc(a:lead, a:cmd, a:pos)
162162
return keys
163163
endfunction"}}}
164+
function! s:vimshell_execute(args)"{{{
165+
call vimshell#execute_internal_command('bg', vimshell#parser#split_args(a:args), { 'stdin' : '', 'stdout' : '', 'stderr' : '' },
166+
\ { 'is_interactive' : 0, 'is_split' : 1 })
167+
endfunction"}}}
168+
function! s:vimshell_interactive(args)"{{{
169+
call vimshell#execute_internal_command('iexe', vimshell#parser#split_args(a:args), { 'stdin' : '', 'stdout' : '', 'stderr' : '' },
170+
\ { 'is_interactive' : 0, 'is_split' : 1 })
171+
endfunction"}}}
172+
function! s:vimshell_terminal(args)"{{{
173+
call vimshell#execute_internal_command('texe', vimshell#parser#split_args(a:args), { 'stdin' : '', 'stdout' : '', 'stderr' : '' },
174+
\ { 'is_interactive' : 0, 'is_split' : 1 })
175+
endfunction"}}}
164176

165177
augroup vimshell
166178
" Detect vimshell rc file.

0 commit comments

Comments
 (0)