diff --git a/README.md b/README.md index 181db3e..7797df9 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ call vundle#rc() " let Vundle manage Vundle - " required! + " required! Bundle 'gmarik/vundle' " My Bundles here: @@ -41,7 +41,7 @@ Bundle 'git://git.wincent.com/command-t.git' " ... - filetype plugin indent on " required! + filetype plugin indent on " required! " " Brief help " :BundleList - list configured bundles @@ -56,7 +56,7 @@ 3. Install configured bundles: - Launch `vim`, run `:BundleInstall`. + Launch `vim`, run `:BundleInstall`. *Windows users* see [Vundle for Windows](https://github.com/gmarik/vundle/wiki/Vundle-for-Windows) @@ -67,7 +67,7 @@ [Vundle] allows to: - keep track and configure your scripts right in `.vimrc` -- [install] configured scripts (aka bundle) +- [install] configured scripts (aka bundle) - [update] configured scripts - [search] by name [all available vim scripts] - [clean] unused scripts up diff --git a/autoload/vundle.vim b/autoload/vundle.vim index 216ee1b..851aaee 100644 --- a/autoload/vundle.vim +++ b/autoload/vundle.vim @@ -22,7 +22,7 @@ com! -nargs=0 -bang BundleList com! -nargs=? -bang BundleClean \ call vundle#installer#clean('!' == '') -com! -nargs=0 BundleDocs +com! -nargs=0 BundleDocs \ call vundle#installer#helptags(g:bundles) diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim index e8443c1..657b8ea 100644 --- a/autoload/vundle/config.vim +++ b/autoload/vundle/config.vim @@ -48,7 +48,7 @@ func! s:parse_name(arg) let uri .= '.git' endif let name = substitute(split(uri,'\/')[-1], '\.git\s*$','','i') - elseif arg =~? '^\s*\(git@\|git://\)\S\+' + elseif arg =~? '^\s*\(git@\|git://\)\S\+' \ || arg =~? '\(file\|https\?\)://' \ || arg =~? '\.git\s*$' let uri = arg diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 269f403..6ac2c0e 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -53,7 +53,7 @@ func! vundle#installer#run(func_name, name, ...) abort redraw! - if 'updated' == status + if 'updated' == status echo n.' installed' elseif 'todate' == status echo n.' already installed' @@ -73,7 +73,7 @@ func! vundle#installer#run(func_name, name, ...) abort return status endf -func! s:sign(status) +func! s:sign(status) if (!has('signs')) return endif @@ -124,7 +124,7 @@ endf func! vundle#installer#clean(bang) abort - let bundle_dirs = map(copy(g:bundles), 'v:val.path()') + let bundle_dirs = map(copy(g:bundles), 'v:val.path()') let all_dirs = split(globpath(g:bundle_dir, '*'), "\n") let x_dirs = filter(all_dirs, '0 > index(bundle_dirs, v:val)') diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 648bf19..e7fbcba 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -54,7 +54,7 @@ func! vundle#scripts#view(title, headers, results) setl noswapfile setl cursorline - setl nonu ro noma ignorecase + setl nonu ro noma ignorecase if (exists('&relativenumber')) | setl norelativenumber | endif setl ft=vundle @@ -65,13 +65,13 @@ func! vundle#scripts#view(title, headers, results) com! -buffer -bang -nargs=1 DeleteBundle \ call vundle#installer#run('vundle#installer#delete', split(,',')[0], ['!' == '', ]) - com! -buffer -bang -nargs=? InstallAndRequireBundle + com! -buffer -bang -nargs=? InstallAndRequireBundle \ call vundle#installer#run('vundle#installer#install_and_require', split(,',')[0], ['!' == '', ]) com! -buffer -bang -nargs=? InstallBundle \ call vundle#installer#run('vundle#installer#install', split(,',')[0], ['!' == '', ]) - com! -buffer -bang -nargs=0 InstallHelptags + com! -buffer -bang -nargs=0 InstallHelptags \ call vundle#installer#run('vundle#installer#docs', 'helptags', []) com! -buffer -nargs=0 VundleLog call s:view_log() @@ -112,7 +112,7 @@ func! s:fetch_scripts(to) elseif executable("wget") let temp = shellescape(tempname()) let cmd = 'wget -q -O '.temp.' '.l:vim_scripts_json. ' && mv -f '.temp.' '.shellescape(a:to) - if (has('win32') || has('win64')) + if (has('win32') || has('win64')) let cmd = substitute(cmd, 'mv -f ', 'mv /Y ') " change force flag let cmd = '"'.cmd.'"' " enclose in quotes so && joined cmds work end diff --git a/doc/vundle.txt b/doc/vundle.txt index 3b347ce..a8b6f1e 100644 --- a/doc/vundle.txt +++ b/doc/vundle.txt @@ -28,7 +28,7 @@ Vundle is a short cut for Vim bundle and is the Vim plug-in manager. Vundle allows to: - keep track and configure your scripts right in `.vimrc` -- install configured scripts (aka bundle) +- install configured scripts (aka bundle) - update configured scripts - search [all available vim scripts] by name - clean up from unused scripts @@ -38,7 +38,7 @@ Also *Vundle* : - manages runtime path of your installed scripts - regenerates helptags automatically -Vundle takes advantage of [vim-scripts.org](http://vim-scripts.org) +Vundle takes advantage of [vim-scripts.org](http://vim-scripts.org) in order to install/search [all available vim scripts] 3. QUICK START ~ @@ -54,7 +54,7 @@ in order to install/search [all available vim scripts] set nocompatible " be iMproved filetype off " required! - set rtp+=~/.vim/vundle.git/ + set rtp+=~/.vim/vundle.git/ call vundle#rc() " let Vundle manage Vundle @@ -75,7 +75,7 @@ in order to install/search [all available vim scripts] " ... filetype plugin indent on " required! - " or + " or " filetype plugin on " to not use the indentation settings set by plugins 3) Install configured bundles: @@ -84,7 +84,7 @@ in order to install/search [all available vim scripts] :BundleInstall -Installing requires [Git] and triggers [Git clone](http://gitref.org/creating/#clone) for +Installing requires [Git] and triggers [Git clone](http://gitref.org/creating/#clone) for each configured repo to `~/.vim/bundle/`. 4. SCRIPTS ~ @@ -94,7 +94,7 @@ each configured repo to `~/.vim/bundle/`. Before installing scripts they need to be configured. It's done using `Bundle` command in `.vimrc`: > - Bundle 'git_repo_uri' " 'git_repo_uri' should be a valid uri to git repository + Bundle 'git_repo_uri' " 'git_repo_uri' should be a valid uri to git repository or > Bundle 'script_name' " 'script-name' should be an official script name (see |vundle-scripts-search| ) @@ -122,7 +122,7 @@ BundleInstall allows to install scripts by name:> :BundleInstall unite.vim installs and activates unite.vim. You can use Tab to auto-complete known script names. -NOTE: installation, as just described, doesn't automatically configure scripts; +NOTE: installation, as just described, doesn't automatically configure scripts; you have to configure them manually. 4.3 UPDATE SCRIPTS ~ @@ -170,11 +170,11 @@ run > :BundleClean -requires confirmation before removal of unused script-dirs from your `.vim/bundle`. +requires confirmation before removal of unused script-dirs from your `.vim/bundle`. *BundleClean!* > - :BundleClean! + :BundleClean! removes unused scripts with no questions. @@ -201,8 +201,8 @@ content: > Bundle 'unite-colorscheme' As the first line(starting with `"Keymap:`) shows, certain actions may be applied -to selected bundles . Move cursor over line `Bundle 'unite.vim'` and press i -key(install, see |vundle-keymappings| for more details). +to selected bundles . Move cursor over line `Bundle 'unite.vim'` and press i +key(install, see |vundle-keymappings| for more details). After unite.vim is installed - `:Unite file` command should be available to prove 'unite.vim' availability. diff --git a/test/vimrc b/test/vimrc index d0ff49c..ff80c52 100644 --- a/test/vimrc +++ b/test/vimrc @@ -2,8 +2,8 @@ set nocompatible let root = '/tmp/vundle_bundles/' -let src = 'http://github.com/gmarik/vundle.git' -" let src = '~/.vim/bundle/vundle/.git' +let src = 'http://github.com/gmarik/vundle.git' +" let src = '~/.vim/bundle/vundle/.git' if !isdirectory(expand(root).'/vundle') exec '!git clone '.src.' '.root.'/vundle'