Merge 240000ab28 into 5d9b059701

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 <silent> <buffer> q :silent bd!<CR>
-  nnoremap <silent> <buffer> D :exec 'Delete'.getline('.')<CR>
+  nnoremap <buffer> q :silent bd!<CR>
+  nnoremap <buffer> D :exec 'Delete'.getline('.')<CR>
 
-  nnoremap <silent> <buffer> add  :exec 'Install'.getline('.')<CR>
-  nnoremap <silent> <buffer> add! :exec 'Install'.substitute(getline('.'), '^Plugin ', 'Plugin! ', '')<CR>
+  nnoremap <buffer> add  :exec 'Install'.getline('.')<CR>
+  nnoremap <buffer> add! :exec 'Install'.substitute(getline('.'), '^Plugin ', 'Plugin! ', '')<CR>
 
-  nnoremap <silent> <buffer> i :exec 'InstallAndRequire'.getline('.')<CR>
-  nnoremap <silent> <buffer> I :exec 'InstallAndRequire'.substitute(getline('.'), '^Plugin ', 'Plugin! ', '')<CR>
+  nnoremap <buffer> i :exec 'InstallAndRequire'.getline('.')<CR>
+  nnoremap <buffer> I :exec 'InstallAndRequire'.substitute(getline('.'), '^Plugin ', 'Plugin! ', '')<CR>
 
-  nnoremap <silent> <buffer> l :VundleLog<CR>
-  nnoremap <silent> <buffer> u :VundleChangelog<CR>
-  nnoremap <silent> <buffer> h :h vundle<CR>
-  nnoremap <silent> <buffer> ? :h vundle<CR>
+  nnoremap <buffer> l :VundleLog<CR>
+  nnoremap <buffer> u :VundleChangelog<CR>
+  nnoremap <buffer> h :h vundle<CR>
+  nnoremap <buffer> ? :norm h<CR>
 
-  nnoremap <silent> <buffer> c :PluginClean<CR>
-  nnoremap <silent> <buffer> C :PluginClean!<CR>
+  nnoremap <buffer> c :PluginClean<CR>
+  nnoremap <buffer> C :PluginClean!<CR>
 
   nnoremap <buffer> s :PluginSearch
-  nnoremap <silent> <buffer> R :call vundle#scripts#reload()<CR>
+  nnoremap <buffer> R :call vundle#scripts#reload()<CR>
 
   " goto first line after headers
   exec ':'.(len(a:headers) + 1)

ftplugin/vundlelog.vim

@@ -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

syntax/vundlelog.vim

@@ -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