diff --git a/README.md b/README.md index defb752..27adba2 100644 --- a/README.md +++ b/README.md @@ -70,8 +70,9 @@ " The sparkup vim script is in a subdirectory of this repo called vim. " Pass the path to set the runtimepath properly. Plugin 'rstacruz/sparkup', {'rtp': 'vim/'} - " Avoid a name conflict with L9 - Plugin 'user/L9', {'name': 'newL9'} + " Install L9 and avoid a Naming conflict if you've already installed a + " different version somewhere else. + Plugin 'ascenator/L9', {'name': 'newL9'} " All of your Plugins must be added before the following line call vundle#end() " required diff --git a/README_ZH_CN.md b/README_ZH_CN.md index 61ffb00..c393fbf 100644 --- a/README_ZH_CN.md +++ b/README_ZH_CN.md @@ -72,8 +72,8 @@ " 插件在仓库的子目录中. " 正确指定路径用以设置runtimepath. 以下范例插件在sparkup/vim目录下 Plugin 'rstacruz/sparkup', {'rtp': 'vim/'} - " 避免插件名冲突,例如L9已存在,则可以指定 - Plugin 'user/L9', {'name': 'newL9'} + " 安装L9,如果已经安装过这个插件,可利用以下格式避免命名冲突 + Plugin 'ascenator/L9', {'name': 'newL9'} " 你的所有插件需要在下面这行之前 call vundle#end() " 必须 diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index f789762..6a72998 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -124,7 +124,6 @@ func! s:view_changelog() setl buftype=nofile setl noswapfile setl ro noma - setfiletype vundlelog wincmd P | wincmd H endf @@ -197,25 +196,25 @@ func! vundle#scripts#view(title, headers, results) com! -buffer -nargs=0 VundleChangelog call s:view_changelog() - nnoremap q :silent bd! - nnoremap D :exec 'Delete'.getline('.') + nnoremap q :silent bd! + nnoremap D :exec 'Delete'.getline('.') - nnoremap add :exec 'Install'.getline('.') - nnoremap add! :exec 'Install'.substitute(getline('.'), '^Plugin ', 'Plugin! ', '') + nnoremap add :exec 'Install'.getline('.') + nnoremap add! :exec 'Install'.substitute(getline('.'), '^Plugin ', 'Plugin! ', '') - nnoremap i :exec 'InstallAndRequire'.getline('.') - nnoremap I :exec 'InstallAndRequire'.substitute(getline('.'), '^Plugin ', 'Plugin! ', '') + nnoremap i :exec 'InstallAndRequire'.getline('.') + nnoremap I :exec 'InstallAndRequire'.substitute(getline('.'), '^Plugin ', 'Plugin! ', '') - nnoremap l :VundleLog - nnoremap u :VundleChangelog - nnoremap h :h vundle - nnoremap ? :h vundle + nnoremap l :VundleLog + nnoremap u :VundleChangelog + nnoremap h :h vundle + nnoremap ? :norm h - nnoremap c :PluginClean - nnoremap C :PluginClean! + nnoremap c :PluginClean + nnoremap C :PluginClean! nnoremap s :PluginSearch - nnoremap R :call vundle#scripts#reload() + nnoremap R :call vundle#scripts#reload() " goto first line after headers exec ':'.(len(a:headers) + 1) diff --git a/ftplugin/vundlelog.vim b/ftplugin/vundlelog.vim deleted file mode 100644 index 0f338eb..0000000 --- a/ftplugin/vundlelog.vim +++ /dev/null @@ -1,15 +0,0 @@ -" --------------------------------------------------------------------------- -" Standard ftplugin boilerplate; see ':help ftplugin'. -" --------------------------------------------------------------------------- -if exists("b:did_ftplugin") - finish -endif -let b:did_ftplugin = 1 - - -" --------------------------------------------------------------------------- -" Settings for the Vundle update log buffer. -" --------------------------------------------------------------------------- -setlocal textwidth=0 -setlocal nowrap -setlocal noswapfile diff --git a/syntax/vundlelog.vim b/syntax/vundlelog.vim deleted file mode 100644 index 64e81e3..0000000 --- a/syntax/vundlelog.vim +++ /dev/null @@ -1,36 +0,0 @@ -" --------------------------------------------------------------------------- -" Syntax highlighting for the line which identifies the plugin. -" --------------------------------------------------------------------------- -syntax match VundlePluginName '\v(^Updated Plugin: )@<=.*$' -highlight link VundlePluginName Keyword - -" --------------------------------------------------------------------------- -" Syntax highlighting for the 'compare at' line of each plugin. -" --------------------------------------------------------------------------- -syntax region VundleCompareLine start='\v^Compare at: https:' end='\v\n' - \ contains=VundleCompareUrl -syntax match VundleCompareUrl '\vhttps:\S+' -highlight link VundleCompareLine Comment -highlight link VundleCompareUrl Underlined - -" --------------------------------------------------------------------------- -" Syntax highlighting for individual commits. -" --------------------------------------------------------------------------- -" The main commit line. -" Note that this regex is intimately related to the one for VundleCommitTree, -" and the two should be changed in sync. -syntax match VundleCommitLine '\v(^ [|*]( *[\\|/\*])* )@<=[^*|].*$' - \ contains=VundleCommitMerge,VundleCommitUser,VundleCommitTime -highlight link VundleCommitLine String -" Sub-regions inside the commit message. -syntax match VundleCommitMerge '\v Merge pull request #\d+.*' -syntax match VundleCommitUser '\v( )@<=\S+( \S+)*(, \d+ \w+ ago$)@=' -syntax match VundleCommitTime '\v(, )@<=\d+ \w+ ago$' -highlight link VundleCommitMerge Ignore -highlight link VundleCommitUser Identifier -highlight link VundleCommitTime Comment -" The git history DAG markers are outside of the main commit line region. -" Note that this regex is intimately related to the one for VundleCommitLine, -" and the two should be changed in sync. -syntax match VundleCommitTree '\v(^ )@<=[|*]( *[\\|/\*])*' -highlight link VundleCommitTree Label