- Merged.

roman · Dec 25, 2010 · 44e4272 · 44e4272
2 parents 07babcb + eb2fde5
commit 44e4272
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/autoload/vimshell/help.vim b/autoload/vimshell/help.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: help.vim
 " AUTHOR: Shougo Matsushita <Shougo.Matsu@gmail.com>
-" Last Modified: 23 Dec 2010.
+" Last Modified: 24 Dec 2010.
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
 "     a copy of this software and associated documentation files (the
@@ -51,22 +51,18 @@ function! s:doc_dict.search(cur_text)"{{{
     let l:description = l:commands[l:command].description
   endif
 
+  let l:usage = [{ 'text' : 'Usage: ', 'highlight' : 'Identifier' }]
   if l:description =~? '^usage:\s*'
-    return [
-          \ { 'text' : 'Usage: ', 'highlight' : 'Identifier' },
-          \ { 'text' : l:command, 'highlight' : 'Statement' },
-          \ { 'text' : ' ' . join(split(l:description)[2:]) },
-          \ ]
+    call add(l:usage, { 'text' : l:command, 'highlight' : 'Statement' })
+    call add(l:usage, { 'text' : ' ' . join(split(l:description)[2:]) })
   elseif l:description =~# l:command.'\s*'
-    return [
-          \ { 'text' : l:command, 'highlight' : 'Statement' },
-          \ { 'text' : l:description[len(l:command) :] },
-          \ ]
+    call add(l:usage, { 'text' : l:command, 'highlight' : 'Statement' })
+    call add(l:usage, { 'text' : l:description[len(l:command) :] })
   else
-    return [
-          \ { 'text' : l:description },
-          \ ]
+    call add(l:usage, { 'text' : l:description })
   endif
+
+  return l:usage
 endfunction"}}}
 "}}}
 

diff --git a/doc/vimshell.txt b/doc/vimshell.txt
@@ -187,6 +187,9 @@ CHANGELOG						*vimshell-changelog*
 2010-12-25
 - Fixed :VimShellSendString.
 
+2010-12-24
+- Improved usage.
+
 2010-12-23
 - Supported echodoc.
 - Added gendoc command.

diff --git a/plugin/vimshell.vim b/plugin/vimshell.vim
@@ -178,7 +178,7 @@ nnoremap <silent> <Plug>(vimshell_create)  :<C-u>call vimshell#create_shell(0, '
 " Command functions:
 function! s:execute_completefunc(lead, cmd, pos)"{{{
   silent! let keys = vimshell#complete#vimshell_execute_complete#completefunc(a:lead, a:cmd, a:pos)
-  return keys 
+  return keys
 endfunction"}}}
 function! s:vimshell_execute(args)"{{{
   call vimshell#execute_internal_command('bg', vimproc#parser#split_args(a:args), { 'stdin' : '', 'stdout' : '', 'stderr' : '' },