* Print lines if one screen in view.

* Fixed nomodifiable error in view.
* Revised internal vim command.

Author: unknown

autoload/vimshell/internal/view.vim

@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: view.vim
 " AUTHOR: Shougo Matsushita <[email protected]>
-" Last Modified: 11 Feb 2010
+" Last Modified: 26 Feb 2010
 " Usage: Just source this file.
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
@@ -23,9 +23,13 @@
 "     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 "     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 " }}}
-" Version: 1.5, for Vim 7.0
+" Version: 1.6, for Vim 7.0
 "-----------------------------------------------------------------------------
 " ChangeLog: "{{{
+"   1.6:
+"     - Print lines if one screen.
+"     - Fixed nomodifiable error.
+"
 "   1.5:
 "     - Catch error.
 "
@@ -56,16 +60,30 @@
 function! vimshell#internal#view#execute(program, args, fd, other_info)
   " View file.
 
-  " Filename escape
-  let l:arguments = join(a:args, ' ')
+  if empty(a:args)
+    if a:fd.stdin == ''
+      vimshell#error_line(a:fd, 'Filename required.')
+      return 0
+    endif
+    
+    " Read from stdin.
+    let l:filename = a:fd.stdin
+  else
+    let l:filename = a:args[0]
+  endif
 
-  if isdirectory(l:arguments)
+  if isdirectory(l:filename)
     " Ignore.
     return 0
   endif
 
-  if empty(l:arguments)
-    vimshell#error_line(a:fd, 'Filename required.')
+  let l:lines = readfile(l:filename)
+  if len(l:lines) < winheight(0)
+    " Print lines if one screen.
+    for l:line in l:lines
+      call vimshell#print_line(a:fd, l:line)
+    endfor
+    
     return 0
   endif
 
@@ -78,11 +96,12 @@ function! vimshell#internal#view#execute(program, args, fd, other_info)
   call vimshell#split_nicely()
 
   try
-    edit `=l:arguments`
+    edit `=l:filename`
   catch /^.*/
     echohl Error | echomsg v:errmsg | echohl None
   endtry
 
   lcd `=l:cwd`
   setlocal nomodifiable
+  return 1
 endfunction

autoload/vimshell/internal/vim.vim

@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: vim.vim
 " AUTHOR: Shougo Matsushita <[email protected]>
-" Last Modified: 11 Feb 2010
+" Last Modified: 26 Feb 2010
 " Usage: Just source this file.
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
@@ -23,9 +23,12 @@
 "     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 "     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 " }}}
-" Version: 1.5, for Vim 7.0
+" Version: 1.6, for Vim 7.0
 "-----------------------------------------------------------------------------
 " ChangeLog: "{{{
+"   1.6:
+"     - Revised.
+"
 "   1.5:
 "     - Catch error.
 "
@@ -56,8 +59,12 @@
 function! vimshell#internal#vim#execute(program, args, fd, other_info)
   " Edit file.
 
-  " Filename escape
-  let l:arguments = join(a:args, ' ')
+  if empty(a:args)
+    " Read from stdin.
+    let l:filename = a:fd.stdin
+  else
+    let l:filename = a:args[0]
+  endif
 
   call vimshell#print_prompt()
 
@@ -71,7 +78,7 @@ function! vimshell#internal#vim#execute(program, args, fd, other_info)
     let l:is_split = 1
   endif
 
-  if empty(l:arguments)
+  if l:filename == ''
     if l:is_split
       new
     else
@@ -85,7 +92,7 @@ function! vimshell#internal#vim#execute(program, args, fd, other_info)
     endif
 
     try
-      edit `=l:arguments`
+      edit `=l:filename`
     catch
       echohl Error | echomsg v:errmsg | echohl None
     endtry

doc/vimshell.txt

@@ -117,6 +117,11 @@ ability of vimshell will spread by creating plugin by yourself.
 ==============================================================================
 CHANGELOG					*vimshell-changelog*
 
+2010-02-26
+    * Print lines if one screen in view.
+    * Fixed nomodifiable error in view.
+    * Revised internal vim command.
+
 2010-02-24
     * Fixed interactive filetype.
     * Ignore .gitignore in vcs_git.