Skip to content

Commit 89c36a0

Browse files
author
amix
committed
Updated plugins
1 parent 2a9908e commit 89c36a0

File tree

97 files changed

+3609
-1629
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+3609
-1629
lines changed

autoload/pathogen.vim

+174-153
Large diffs are not rendered by default.

sources_non_forked/goyo.vim/plugin/goyo.vim

+10-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ function! s:setup_pad(bufnr, vert, size)
6464
execute win . 'wincmd w'
6565
execute (a:vert ? 'vertical ' : '') . 'resize ' . max([0, a:size])
6666
augroup goyop
67-
autocmd WinEnter,CursorMoved <buffer> call s:blank()
67+
autocmd WinEnter,CursorMoved <buffer> nested call s:blank()
68+
autocmd WinLeave <buffer> call s:hide_statusline()
6869
augroup END
6970

7071
" To hide scrollbars of pad windows in GVim
@@ -114,6 +115,10 @@ function! s:tranquilize()
114115
endfor
115116
endfunction
116117

118+
function! s:hide_statusline()
119+
let &l:statusline = repeat(' ', winwidth(0))
120+
endfunction
121+
117122
function! s:goyo_on(width)
118123
let s:orig_tab = tabpagenr()
119124

@@ -131,7 +136,6 @@ function! s:goyo_on(width)
131136
\ 'winwidth': &winwidth,
132137
\ 'winminheight': &winminheight,
133138
\ 'winheight': &winheight,
134-
\ 'statusline': &statusline,
135139
\ 'ruler': &ruler,
136140
\ 'sidescroll': &sidescroll,
137141
\ 'sidescrolloff': &sidescrolloff
@@ -211,19 +215,20 @@ function! s:goyo_on(width)
211215
call s:resize_pads()
212216
call s:tranquilize()
213217

214-
let &statusline = repeat(' ', winwidth(0))
215-
216218
augroup goyo
217219
autocmd!
218220
autocmd BufWinLeave <buffer> call s:goyo_off()
219221
autocmd TabLeave * call s:goyo_off()
220222
autocmd VimResized * call s:resize_pads()
221223
autocmd ColorScheme * call s:tranquilize()
224+
autocmd WinEnter,WinLeave <buffer> call s:hide_statusline()
222225
augroup END
223226

227+
call s:hide_statusline()
224228
if exists('g:goyo_callbacks[0]')
225229
call g:goyo_callbacks[0]()
226230
endif
231+
silent! doautocmd User GoyoEnter
227232
endfunction
228233

229234
function! s:goyo_off()
@@ -312,6 +317,7 @@ function! s:goyo_off()
312317
if exists('g:goyo_callbacks[1]')
313318
call g:goyo_callbacks[1]()
314319
endif
320+
silent! doautocmd User GoyoLeave
315321
endfunction
316322

317323
function! s:goyo(bang, ...)

sources_non_forked/nerdtree/doc/NERD_tree.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,8 @@ Jump to the previous sibling of the selected node.
462462
------------------------------------------------------------------------------
463463
*NERDTree-C*
464464
Default key: C
465-
Map option: NERDTreeMapChdir
466-
Applies to: directories.
465+
Map option: NERDTreeMapChangeRoot
466+
Applies to: files and directories.
467467

468468
Make the selected directory node the new tree root. If a file is selected, its
469469
parent is used.

sources_non_forked/syntastic/README.markdown

+55-26
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@ C++, C#, Cabal, Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart,
4040
DocBook, Dust, Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go,
4141
Haml, Haskell, Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS,
4242
Lex, Limbo, LISP, LLVM intermediate language, Lua, MATLAB, NASM, Objective-C,
43-
Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X
44-
and iOS property lists, Puppet, Python, Racket, R, reStructuredText, Ruby,
45-
SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo, Twig, TypeScript, Vala, Verilog,
46-
VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope page templates, and zsh.
47-
See the [wiki][3] for details about the corresponding supported checkers.
43+
Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X and
44+
iOS property lists, Puppet, Python, Racket, R, reStructuredText, RPM spec,
45+
Ruby, SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo, Twig, TypeScript, Vala,
46+
Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope page templates,
47+
and zsh. See the [wiki][3] for details about the corresponding supported
48+
checkers.
4849

4950
Below is a screenshot showing the methods that Syntastic uses to display syntax
5051
errors. Note that, in practise, you will only have a subset of these methods
@@ -127,6 +128,16 @@ error output for a syntax checker may have changed. In this case, make sure you
127128
have the latest version of the syntax checker installed. If it still fails then
128129
create an issue - or better yet, create a pull request.
129130

131+
<a name="faqpython3"></a>
132+
133+
__Q. The `python` checker complains about syntactically valid Python 3 constructs...__
134+
135+
A. Configure the `python` checker to call a Python 3 interpreter rather than
136+
Python 2, e.g:
137+
```vim
138+
let g:syntastic_python_python_exec = '/path/to/python3'
139+
```
140+
130141
<a name="faqperl"></a>
131142

132143
__Q. The `perl` checker has stopped working...__
@@ -153,7 +164,8 @@ automatically by syntastic.
153164

154165
<a name="faqloclist"></a>
155166

156-
__Q. I run a checker and the location list is not updated...__
167+
__Q. I run a checker and the location list is not updated...__
168+
__Q. I run`:lopen` or `:lwindow` and the error window is empty...__
157169

158170
A. By default the location list is changed only when you run the `:Errors`
159171
command, in order to minimise conflicts with other plugins. If you want the
@@ -200,8 +212,7 @@ To tell syntastic to use `pylint`, you would use this setting:
200212
let g:syntastic_python_checkers = ['pylint']
201213
```
202214

203-
Some filetypes, like PHP, have style checkers as well as syntax checkers. These
204-
can be chained together like this:
215+
Checkers can be chained together like this:
205216
```vim
206217
let g:syntastic_php_checkers = ['php', 'phpcs', 'phpmd']
207218
```
@@ -219,7 +230,37 @@ e.g. to run `phpcs` and `phpmd`:
219230
This works for any checkers available for the current filetype, even if they
220231
aren't listed in `g:syntastic_<filetype>_checkers`. You can't run checkers for
221232
"foreign" filetypes though (e.g. you can't run, say, a Python checker if the
222-
current filetype is `php`).
233+
filetype of the current file is `php`).
234+
235+
<a name="faqstyle"></a>
236+
237+
__Q. What is the difference between syntax checkers and style checkers?__
238+
239+
A. The errors and warnings they produce are highlighted differently and can
240+
be filtered by different rules, but otherwise the distinction is pretty much
241+
arbitrary. There is an ongoing effort to keep things consistent, so you can
242+
_generally_ expect messages produced by syntax checkers to be _mostly_ related
243+
to syntax, and messages produced by style checkers to be _mostly_ about style.
244+
But there can be no formal guarantee that, say, a style checker that runs into
245+
a syntax error wouldn't die with a fatal message, nor that a syntax checker
246+
wouldn't give you warnings against using some constructs as being bad practice.
247+
There is also no guarantee that messages marked as "style" are less severe than
248+
the ones marked as "syntax" (whatever that might mean). And there are even a
249+
few Frankenstein checkers (for example `flake8` and `pylama`) that, by their
250+
nature, produce both kinds of messages. Syntastic is not smart enough to be
251+
able to sort out these things by itself.
252+
253+
In fact it's more useful to look at this from the perspective of filtering
254+
unwanted messages, rather than as an indicator of severity levels. The
255+
distinction between syntax and style is orthogonal to the distinction between
256+
errors and warnings, and thus you can turn off messages based on level, on
257+
type, or both.
258+
259+
e.g. To disable all style messages:
260+
```vim
261+
let g:syntastic_quiet_messages = { "type": "style" }
262+
```
263+
See `:help syntastic_quiet_messages` for details.
223264

224265
<a name="faqaggregate"></a>
225266

@@ -238,29 +279,13 @@ See `:help syntastic-aggregating-errors` for more details.
238279
__Q. How can I jump between the different errors without using the location
239280
list at the bottom of the window?__
240281

241-
A. Vim provides several built in commands for this. See `:help :lnext` and
282+
A. Vim provides several built-in commands for this. See `:help :lnext` and
242283
`:help :lprev`.
243284

244285
If you use these commands a lot then you may want to add shortcut mappings to
245286
your vimrc, or install something like [unimpaired][2], which provides such
246287
mappings (among other things).
247288

248-
<a name="faqstyle"></a>
249-
250-
__Q. A syntax checker is giving me unwanted/strange style tips?__
251-
252-
A. Some filetypes (e.g. php) have style checkers as well as syntax
253-
checkers. You can usually configure the options that are passed to the style
254-
checkers, or just disable them. Take a look at the [wiki][3] to see what
255-
options are available.
256-
257-
Alternatively, you can use `g:syntastic_quiet_messages` to filter out the
258-
messages you don't want to see. e.g. To turn off all style messages:
259-
```vim
260-
let g:syntastic_quiet_messages = { "type": "style" }
261-
```
262-
See `:help syntastic_quiet_messages` for details.
263-
264289
<a name="faqbdelete"></a>
265290

266291
__Q. The error window is closed automatically when I :quit the current buffer
@@ -303,3 +328,7 @@ a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
303328
[10]: http://perldoc.perl.org/perlrun.html#*-c*
304329
[11]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
305330
[12]: https://github.com/rust-lang/rust/
331+
332+
<!--
333+
vim:tw=79:sw=4:
334+
-->

sources_non_forked/syntastic/autoload/syntastic/c.vim

+33-33
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ endfunction " }}}2
6262
" GetLocList() for C-like compilers
6363
function! syntastic#c#GetLocList(filetype, subchecker, options) " {{{2
6464
try
65-
let flags = s:getCflags(a:filetype, a:subchecker, a:options)
65+
let flags = s:_getCflags(a:filetype, a:subchecker, a:options)
6666
catch /\m\C^Syntastic: skip checks$/
6767
return []
6868
endtry
6969

7070
let makeprg = syntastic#util#shexpand(g:syntastic_{a:filetype}_compiler) .
7171
\ ' ' . flags . ' ' . syntastic#util#shexpand('%')
7272

73-
let errorformat = s:getCheckerVar('g', a:filetype, a:subchecker, 'errorformat', a:options['errorformat'])
73+
let errorformat = s:_getCheckerVar('g', a:filetype, a:subchecker, 'errorformat', a:options['errorformat'])
7474

75-
let postprocess = s:getCheckerVar('g', a:filetype, a:subchecker, 'remove_include_errors', 0) ?
75+
let postprocess = s:_getCheckerVar('g', a:filetype, a:subchecker, 'remove_include_errors', 0) ?
7676
\ ['filterForeignErrors'] : []
7777

7878
" process makeprg
@@ -87,29 +87,29 @@ endfunction " }}}2
8787
" Private functions {{{1
8888

8989
" initialize c/cpp syntax checker handlers
90-
function! s:init() " {{{2
90+
function! s:_init() " {{{2
9191
let s:handlers = []
9292
let s:cflags = {}
9393

94-
call s:regHandler('\m\<cairo', 'syntastic#c#checkPKG', ['cairo', 'cairo'])
95-
call s:regHandler('\m\<freetype', 'syntastic#c#checkPKG', ['freetype', 'freetype2', 'freetype'])
96-
call s:regHandler('\m\<glade', 'syntastic#c#checkPKG', ['glade', 'libglade-2.0', 'libglade'])
97-
call s:regHandler('\m\<glib', 'syntastic#c#checkPKG', ['glib', 'glib-2.0', 'glib'])
98-
call s:regHandler('\m\<gtk', 'syntastic#c#checkPKG', ['gtk', 'gtk+-2.0', 'gtk+', 'glib-2.0', 'glib'])
99-
call s:regHandler('\m\<libsoup', 'syntastic#c#checkPKG', ['libsoup', 'libsoup-2.4', 'libsoup-2.2'])
100-
call s:regHandler('\m\<libxml', 'syntastic#c#checkPKG', ['libxml', 'libxml-2.0', 'libxml'])
101-
call s:regHandler('\m\<pango', 'syntastic#c#checkPKG', ['pango', 'pango'])
102-
call s:regHandler('\m\<SDL', 'syntastic#c#checkPKG', ['sdl', 'sdl'])
103-
call s:regHandler('\m\<opengl', 'syntastic#c#checkPKG', ['opengl', 'gl'])
104-
call s:regHandler('\m\<webkit', 'syntastic#c#checkPKG', ['webkit', 'webkit-1.0'])
105-
106-
call s:regHandler('\m\<php\.h\>', 'syntastic#c#checkPHP', [])
107-
call s:regHandler('\m\<Python\.h\>', 'syntastic#c#checkPython', [])
108-
call s:regHandler('\m\<ruby', 'syntastic#c#checkRuby', [])
94+
call s:_regHandler('\m\<cairo', 'syntastic#c#checkPKG', ['cairo', 'cairo'])
95+
call s:_regHandler('\m\<freetype', 'syntastic#c#checkPKG', ['freetype', 'freetype2', 'freetype'])
96+
call s:_regHandler('\m\<glade', 'syntastic#c#checkPKG', ['glade', 'libglade-2.0', 'libglade'])
97+
call s:_regHandler('\m\<glib', 'syntastic#c#checkPKG', ['glib', 'glib-2.0', 'glib'])
98+
call s:_regHandler('\m\<gtk', 'syntastic#c#checkPKG', ['gtk', 'gtk+-2.0', 'gtk+', 'glib-2.0', 'glib'])
99+
call s:_regHandler('\m\<libsoup', 'syntastic#c#checkPKG', ['libsoup', 'libsoup-2.4', 'libsoup-2.2'])
100+
call s:_regHandler('\m\<libxml', 'syntastic#c#checkPKG', ['libxml', 'libxml-2.0', 'libxml'])
101+
call s:_regHandler('\m\<pango', 'syntastic#c#checkPKG', ['pango', 'pango'])
102+
call s:_regHandler('\m\<SDL', 'syntastic#c#checkPKG', ['sdl', 'sdl'])
103+
call s:_regHandler('\m\<opengl', 'syntastic#c#checkPKG', ['opengl', 'gl'])
104+
call s:_regHandler('\m\<webkit', 'syntastic#c#checkPKG', ['webkit', 'webkit-1.0'])
105+
106+
call s:_regHandler('\m\<php\.h\>', 'syntastic#c#checkPHP', [])
107+
call s:_regHandler('\m\<Python\.h\>', 'syntastic#c#checkPython', [])
108+
call s:_regHandler('\m\<ruby', 'syntastic#c#checkRuby', [])
109109
endfunction " }}}2
110110

111111
" return a handler dictionary object
112-
function! s:regHandler(regex, function, args) " {{{2
112+
function! s:_regHandler(regex, function, args) " {{{2
113113
let handler = {}
114114
let handler["regex"] = a:regex
115115
let handler["func"] = function(a:function)
@@ -118,7 +118,7 @@ function! s:regHandler(regex, function, args) " {{{2
118118
endfunction " }}}2
119119

120120
" resolve checker-related user variables
121-
function! s:getCheckerVar(scope, filetype, subchecker, name, default) " {{{2
121+
function! s:_getCheckerVar(scope, filetype, subchecker, name, default) " {{{2
122122
let prefix = a:scope . ':' . 'syntastic_'
123123
if exists(prefix . a:filetype . '_' . a:subchecker . '_' . a:name)
124124
return {a:scope}:syntastic_{a:filetype}_{a:subchecker}_{a:name}
@@ -130,10 +130,10 @@ function! s:getCheckerVar(scope, filetype, subchecker, name, default) " {{{2
130130
endfunction " }}}2
131131

132132
" resolve user CFLAGS
133-
function! s:getCflags(ft, ck, opts) " {{{2
133+
function! s:_getCflags(ft, ck, opts) " {{{2
134134
" determine whether to parse header files as well
135135
if has_key(a:opts, 'header_names') && expand('%') =~? a:opts['header_names']
136-
if s:getCheckerVar('g', a:ft, a:ck, 'check_header', 0)
136+
if s:_getCheckerVar('g', a:ft, a:ck, 'check_header', 0)
137137
let flags = get(a:opts, 'header_flags', '') . ' -c ' . syntastic#c#NullOutput()
138138
else
139139
" checking headers when check_header is unset: bail out
@@ -143,21 +143,21 @@ function! s:getCflags(ft, ck, opts) " {{{2
143143
let flags = get(a:opts, 'main_flags', '')
144144
endif
145145

146-
let flags .= ' ' . s:getCheckerVar('g', a:ft, a:ck, 'compiler_options', '') . ' ' . s:getIncludeDirs(a:ft)
146+
let flags .= ' ' . s:_getCheckerVar('g', a:ft, a:ck, 'compiler_options', '') . ' ' . s:_getIncludeDirs(a:ft)
147147

148148
" check if the user manually set some cflags
149-
let b_cflags = s:getCheckerVar('b', a:ft, a:ck, 'cflags', '')
149+
let b_cflags = s:_getCheckerVar('b', a:ft, a:ck, 'cflags', '')
150150
if b_cflags == ''
151151
" check whether to search for include files at all
152-
if !s:getCheckerVar('g', a:ft, a:ck, 'no_include_search', 0)
152+
if !s:_getCheckerVar('g', a:ft, a:ck, 'no_include_search', 0)
153153
if a:ft ==# 'c' || a:ft ==# 'cpp'
154154
" refresh the include file search if desired
155-
if s:getCheckerVar('g', a:ft, a:ck, 'auto_refresh_includes', 0)
156-
let flags .= ' ' . s:searchHeaders()
155+
if s:_getCheckerVar('g', a:ft, a:ck, 'auto_refresh_includes', 0)
156+
let flags .= ' ' . s:_searchHeaders()
157157
else
158158
" search for header includes if not cached already
159159
if !exists('b:syntastic_' . a:ft . '_includes')
160-
let b:syntastic_{a:ft}_includes = s:searchHeaders()
160+
let b:syntastic_{a:ft}_includes = s:_searchHeaders()
161161
endif
162162
let flags .= ' ' . b:syntastic_{a:ft}_includes
163163
endif
@@ -169,15 +169,15 @@ function! s:getCflags(ft, ck, opts) " {{{2
169169
endif
170170

171171
" add optional config file parameters
172-
let config_file = s:getCheckerVar('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
172+
let config_file = s:_getCheckerVar('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
173173
let flags .= ' ' . syntastic#c#ReadConfig(config_file)
174174

175175
return flags
176176
endfunction " }}}2
177177

178178
" get the gcc include directory argument depending on the default
179179
" includes and the optional user-defined 'g:syntastic_c_include_dirs'
180-
function! s:getIncludeDirs(filetype) " {{{2
180+
function! s:_getIncludeDirs(filetype) " {{{2
181181
let include_dirs = []
182182

183183
if a:filetype =~# '\v^%(c|cpp|objc|objcpp)$' &&
@@ -195,7 +195,7 @@ endfunction " }}}2
195195

196196
" search the first 100 lines for include statements that are
197197
" given in the handlers dictionary
198-
function! s:searchHeaders() " {{{2
198+
function! s:_searchHeaders() " {{{2
199199
let includes = ''
200200
let files = []
201201
let found = []
@@ -324,7 +324,7 @@ let s:default_includes = [
324324
\ '..' . syntastic#util#Slash() . 'include',
325325
\ '..' . syntastic#util#Slash() . 'includes' ]
326326

327-
call s:init()
327+
call s:_init()
328328

329329
let &cpo = s:save_cpo
330330
unlet s:save_cpo

0 commit comments

Comments
 (0)