Squashed '.vim/bundle/vim-easymotion/' changes from 2c4fa0d..2216103

2216103 Bump up version 2.1
c5e6715 Fix unexpected global var
09b0d7b Fix undefined variables
55de0be Merge pull request #199 from thornycrackers/master
58fcc31 Fixing 256 color codes
ca1bb25 Merge branch 'update-vital'
5922bb9 Update vital
2dc0025 Merge branch 'relicense-to-MIT'
0e6d132 Relicence EasyMotion under MIT licence
868cd71 Merge pull request #182 from z0rch/master
91464bd Improve JK motion regex pattern for multibyte
9f1cbd1 fix #181: Next and Prev jumps automatically expand folds
44499ba minor cleanup
3b8a2dd update vital-over
60cb17b Update vital-over: including fix #177
0ae51b2 Merge pull request #176 from yshalabi/patch-1
dc7cca7 Update README.md
7b4aa05 doc: fix grammatical error in the README
8ef9ab5 doc: Fix trivial grammatical error by vim-grammarous
fd556fd Delete undo file explicitly ref: #174
b2951b0 Update vital.vim
6a0030d Do not show version requiring messages on startup
537c2ff Update vital & vital-over
5cd205a Use winrestview() to adjust screen
b0999d6 Lint check with vim-lint
ccefe1a Remove an unused argument
ff793c6 Merge branch 'add-respect-n-N'
78ad6d8 n & N easymotion which respect previous direction
42e02a7 Merge branch 'fix-matchaddpos'
834f76d Fix highlight of second targets with matchaddpos()
70406b7 Reduce lines of code a little
cb801bc Merge branch 'matchaddpos'
57371ae Use matchaddpos() if possible
e2aae85 Merge branch 'fix-count-dotrepeat'
2d2b597 Fix dot repeat with count
d61f2bd Improve a variable name & add a comment
9db99ba Merge branch 'handle-exception'
04788cf Cosmetic change :lipstick:
f524597 Handle EasyMotion exception separating from unexpected one
cd63e50 Fix dotrepeat with count
47f8bbc Remove unused variables
517ce0b TEST: Modify the test case for next/previous
2e2b2ae Merge branch 'fix-jumplist-nextprev'
28236c3 Next/Previous motions with counts are now jump motions
7a03e86 Support count of next/previous in visual mode
bf093ab Merge branch 'update-vital-over'
d910e4f Fix cannot input 4 & 7 by workaround
03573c9 [WIP] couldn't input 4???

git-subtree-dir: .vim/bundle/vim-easymotion
git-subtree-split: 22161037d7be38e1a650f06a169c935c4cdcf6dd
Merge commit '6140a0d54df4ecd811d53d408b540afa7a27dc01'
Squashed '.vim/bundle/sparkup/' changes from 2698971..332db21

332db21 Merge pull request #110 from jefffederman/html_component_compatible
f352ea7 Merge pull request #114 from lukaszkorecki/eruby-support
ea64e47 cleanup
aa716df Add block expressions
f24bf09 Adds Eruby/ERB support
57fa6b8 Merge pull request #113 from pyp/versions_of_jquery
6803426 update versions of jQuery
d997377 Merge pull request #111 from gryftir/master
0626be9 added open-empty-tags option to leave an empty line when there are no child elements
245f200 Merge pull request #109 from pyp/fix_failed_test
8db2a5c Add namespaced element option, allow for html components with dashes
64a2bbc fix failed test
f79988e Merge pull request #107 from pyp/reformat_unittest_file
2d10350 reformat unittest file
b949975 Merge pull request #105 from pyp/duplicate_keys
e720763 Merge pull request #104 from pyp/backslash
0526934 Merge pull request #106 from davidjb/master
00907c3 Update documentation around Vim integration
124d18b remove duplicate key
b6aca03 remove unnecessary backslash in expression

git-subtree-dir: .vim/bundle/sparkup
git-subtree-split: 332db21f6cc3dd398fec4d8f2e4c0cf26d8ca654
Merge commit '1144b6dcdab98c45ecdc8a552aadadf175770f8a'
Squashed '.vim/bundle/Recover.vim/' changes from 3f40403..4935455

4935455 Update recoverPlugin.txt
dc64ae3 easier usage of plugin (fixes #31)
f76b7b3 updated documentation
72911e3 only set swapfile for non-empty buffer
291558f remove useless sleep call, fixes #30
d56f62d Merge github.com:chrisbra/Recover.vim
b666930 updated vimball
661e6c3 make plugin really autoloadable, fixes #29
37699ef move call to statusline function

git-subtree-dir: .vim/bundle/Recover.vim
git-subtree-split: 4935455f0cf4154a5727b781ac28e1cb9e538f81
Merge commit '24529cf83ceab5243ded3f7c2f74850328118a1b'
Squashed '.vim/bundle/YouCompleteMe.vim/python/ycm/completers/python/jedi/' changes from 0d0d123..68378a1

68378a1 Merge pull request #502 from abingham/patch-1
df48457 Added link to emacs-ycmd.
6b88da4 Merge pull request #467 from phillipberndt/master
3189ba7 Add type check to jedi.Interpreter() namespace argument and remove default value
cd648e9 Merge pull request #448 from ppalucki/master
d359f5d Sphinx oneline param type declaration feature
293fa5a Merge pull request #437 from blueyed/doc-changelog-minor
fd2f56f minor: changelog: formatting
93f6d45 minor: changelog: fix typo
a01e4c6 Merge remote-tracking branch 'origin/master' into dev
5e9d957 Don't warn on addition of an int literal plus an unknown int number.
f7c8c43 check not only - but also + for numbers.
96ca596 fix the operation test where static analysis reports additions of ints with non-ints.
852cdad Operator fixes. Subclass of Simple, now.
15f42d9 it should be possible to find the origin of an operation, if it's a faulty one (static analysis)
50ceef6 1 + '1' TypeErrors are now detected, but not shown in the right place
52bbedd renamed company-jedi to anaconda-mode, cc @proofit404
037d5fa static analysis tests for the 1 + '1' test
d350c1f Merge branch 'linter' of github.com:davidhalter/jedi into linter
b0d5d96 Merge pull request #435 from hattya/windows
ec690b9 change the default linter command from 'force' to 'linter'
712e565 use _ctypes for extension tests
10b7ed9 organize imports
00b8263 fix buildout test for Windows
11bc105 skip readline test on Windows
68150f2 fix module name of integration tests for Windows
5b15c0b fix package detection for Windows
2696d95 fix dotted_from_fs_path for Windows
2616143 unicode issues with docstrings should be gone, fixes #420
e07f513 added a test for hex value issues in docstrings, see #427
ee1c504 use the new implementation of splitlines all over the code, fixes #424
ffaacbe new splitlines implementation to get rid of the ugly splitlines we now have as well as (partially) the issue with form feeds
0f665bf test for #424, issues with form feeds
81f3b94 dicts should not be used to check against in get_defined_names, because they cannot contain a defined name (lists and tuples can) so just ignore them., fixes #417
4626a8b test for #417
2134128 another parser issue, very much related to the last one. sometimes a None element was used as a token.fixes #418
0dea47b def/class keywords after an opening parentheses led to empty arrays without closing brackets, tests & fixes #416
3be5220 parentheses checks in the fast parser (tokenizer) have been improved to really cover all cases. real fix for davidhalter/jedi-vim#288
0322678 parentheses should be ignored when calculating the indent of a new block in the fast parser, fixes davidhalter/jedi-vim#288
08f7a43 merged dev and linter
a1bc644 fix a small issue in the alternative test runner
9eec2b2 Merge pull request #434 from hattya/last-part
e14b144 keep newline at end of code
4852c78 Merge pull request #433 from hattya/pytest
ef58f0e Merge pull request #430 from hattya/dev
1eeb567 update pytest to latest stable
3f75ea5 skip newline at end of code
53a32d8 test for parser issues with parentheses indentation, see davidhalter/jedi-vim#288
feae674 CRLF should be also treated as blank line
da89b66 use generator to reduce memory usage
1650f65 reduce loops for finding sub parser
aab4891 reduce regex searches and compile pattern
0610ef1 use del instead of assigning empty iterator
22e5574 Remove some get_defined_names methods, that are not needed anymore.
1fd7ace finally able to remove _get_defined_names_for_position
c1ed3bf cleanup NameFinder.scopes, fully use scope_names_generator.
ea370a0 more consequent usage of scope_names_generator
a7e4d81 also add scope_names_generator to the iterable module classes, as well as cleaning up some old scope_names_generator stuff
3264a18 Merge pull request #407 from hattya/dev
13ada31 replace get_defined_names with scope_names_generator in a lot of places (the cleanup still needs to be done, though).
749d012 change test results, because of inserts in another test file
23008d8 use scope_names_generator in completion api as well. hopefully the last __file__ related issue :)
ea72b46 Also update the changelog temporarily.
bb50c28 Bump release to 0.8.1-final0, because we're doing a release soon.
7d8c1e8 pre-alpha notice in static analysis API
8d395a2 scope_names_generator now works with modules perfectly well.
789d48b fix issues introduced with defined_names.
3865c1a Fixed __file__ issues by always applying a ModuleWrapper in the global scope lookup.
8d63e6f somehow temporary solution to enable completion of __file__
f7a384b fix a multi line issue of var_args with an error token or newline in the beginning.
4ba1c95 multiple files should be scannable in the main analysis API.
ede685c string prefixes are now recognized by the backwards tokenizer
5099c44 exceptions were ignored in jedis static analysis. They shouldn't be.
58d7dac fix dict issue with **kwargs use
0b99473 ExecutedParams should never be additionally faked, even if they are the first params. They have been legitimately created by a caller.
0d3ea4d fix a ModuleWrapper with StarImports. Now all modules are wrapped.
5b7c869 types also add to completions, also for compiled objects. removed a few lines of code that complicated the process as well.
7d73e57 json.load[s] shouldn't return any results. fixed by overwriting the method
cf1fd69 custom copy.copy and copy.deepcopy implementations to not confuse autocompletion (just return the first param)
8cd7f9a std -> stdlib
aba4a16 fix indexing issues for multiple index options
4c849f5 make it possible to access pdb with 'python -m jedi force --pdb'
d444ef9 setdefault fix
1c9058c Also issue warnings if setattr is used in a class instead of an error
4238538 Add __getattr__ checks with proper inheritance.
a936cea jedi issues now warnings instead of errors for AttributeErrors that happen in instances with __getattr__/__getattribute__ methods
7e0edc4 preparation for warnings in static analysis
bdcbac1 fix string/array (sequence) multiplications with integer.
47205dd change the implementation of compiled.load_module and always use the sys.modules cache after an import, because it's easier. Doesn't require any logic.
e5efd6e add a setting auto_import_modules to fix autocompletion for modules that use setattr and companions a lot. fixes #151
01869e4 make a translation from file system paths to dotted paths possible
718df56 memoize sys_path modifications
6e82fa3 submodules need relative imports not absolute
44238a9 submodules are automatically indexed without actually importing them. fixes #413. However, this is not a 100% correct Python behavior. Python behavior would be to follow ALL imports in all modules (recursively) and check if the module was imported. However, that's a lot of work, that would slow down autocompletion. For now it's better to have no false positives in flaking and to ignore a few attribute errors.
034a818 repr improvements
3938330 fixed inheritance for exception checks
c1181a0 fix except: usage in analysis
9348d4b jedi should be able to detect exceptions even in except X: statements
e106e4f fixed for loop in exception issue combined with usage of an exception variable
401914e exception elements are always instances
3e0f719 changed the way how the dynamic param function searches it's parent scope, to enable smooth list comprehension following
b7bf8d5 support for completions on return statements.
d752907 temporary solution for completions in asserts
ddca149 introduce an is_scope function to make it easier to work with scopes
3ee3a04 fix list comprehension issues in nested parentheses.
2fc404f fix issue with list comprehensions in function calls
8c924af manifest was missing the fake paths, which makes the last release a bad one. This means basically that in the last (few?) release(s) the stdlib was not correctly supported.
ea271c8 replace _sre fake module literals with undefined types.
be3ac0b fix issue with reordering var_args
bbc5ad7 Merge pull request #423 from syohex/fix-package_data
36fbb6c reorder var_args if named arguments are in front of *args.
605ab9c Fix package_data '*.pym' paths
6edff1d Merge pull request #403 from mfussenegger/dev_buildout
bf43fcf detect buildout and add buildout eggs to sys.path
a373818 fix function execution mutable list issue
eb1f299 function repr should only include the decorated function if it actually is one.
8aeac47 message improvement for param failure
acfa40a *args without self but still an implicit self from a method decorator
371ec88 further test for list comprehensions
d5758ad fix list comprehensions. they were not implemented in a good way
f5f8d99 Merge pull request #422 from fbergroth/fix-completion-params
f8b79b3 work in progress refactoring to make ListComprehension a sublass of ForFlow
d3ac1e9 Always cast pr to er in _follow_statements_imports
43e54b6 list comprehensions should be able to serve as an input for dynamic params as well.
63868fe hasattr checks working now, #408
bba120d hasattr test for static analysis, it's a common idiom.
c6aea92 fix issues with tokens in expression list
e6331f8 fix issues with the previous commits (broken tests)
081fa79 fix issues with generator comprehensions used directly with a send() call or something similar
9cffbef tests for generator to tuple assignment as well as generator comprehensions
af801ef make generator comprehensions work
cd5b8ae fix issues with equal names before and after listcomprehension
0b926ca get rid of is_list_comp boolean in favor of a direct check of ListComprehensionFlow
dd8e434 create a ListComprehensionFlow, to make the distinction between ForFlow and list comprehensions clearer
c481460 test: list comprehension name resolve should not include its own definitions
4966719 instance issue with param static analysis
920eb3b fix a default argument issue
c8b7d79 erroneus star arguments warning
62db176 cleanup
f061de0 Wrong var_args with a star star function.
cb430c4 add a merged array class to account for array additions
8798f5b add comments to the *args/**kwargs merge code
cf7b5b6 disable two failing multiple value tests. These are things jedi is not able to detect at the moment. It's not a huge problem, but it would be very nice if we could detect these as well. But there would be a need of restructuring var_args unpacking.
6f83eb6 raise multiple key errors also if they are an input to kwargs
acb4959 temporary very unfinished solution for the *args/**kwargs combination problem, if they are used in common with dynamic params. This doesn't solve the issue entirely, but it's at least a start and will probably solve all autocompletion issues. However, static analysis needs a little bit more than that.
945888a fix for kwargs params
933e231 small update on multiple value named argument type error
b8525c7 get dicts partially working
248cca2 fix issues with empty *args as inputs
f4a508a handle *args arguments the right way.
b24178b multiple values refactoring in params
1899f16 if there's a func listener, stop the execution of a function. This solves the issue of nested *args that were reported as having too many params in static analysis.
4f66591 nested functions with *args should only raise an error if there's well defined input.
a695166 add a new static_analysis file to test star arguments separately
11e867d fix calling_var_args with tuples
23edfd2 detect origin of a call in case of missing params. This is important, because the user doesn't care about decorators in between.
b7aaec5 add ExecutedParam instead of using copy.copy
40c2d64 use the internal api to get a param name instead of doing crazy stuff
f3e986a add multiple values for keyword type error detection
7209075 small corrections in too few argument errors
425f7a8 better error reporting for static analysis
3a946ab fix for the newly created keyword/default tests
f71e2d5 keyword/default param tests
e46979c improved static analysis found mistakes in its own test suite
ad120f5 param.py doesn't seem to be needing some default value checks
a621662 some param refactorings.
d9f17be unexpected keyword arguments detection
acd836f new named arguments tests for static analysis
9214e0b move a closure out of get_params
9d4dc54 first version of too few params detection
4ecc150 first version of too many arguments detection
a252d82 remove an unimportant test case that showed strange unreproducible behavior on travis.
f57b53b check for 'if foo is not None' checks in the NameFinder. Solves the issues with the subprocess library.
79556a7 finder docstring and naming improvements
ad762f6 renaming of an unclear variable
dd50001 update pickling version, because we have changed some things about the KeywordStatement a while ago
77baabb % operation returned both left and right side, but only the left side is really important.
a717981 more extensive __file__ tests, #408
08b4880 a (temporary) solution for the __file__ access issues in imported modules, see #408
709c53a empty reversed issue, fixes traceback of #408
41f32f2 Merge pull request #411 from jorgenschaefer/fix-deprecation-docstring-typo
1cbbc00 Fix names in docstrings and DeprecationWarnings.
06bae0e fix test issue with python 2.7
ecf9043 Improved error messages for AttributeErrors, however not a final version #408
ca2cc65 improved import positioning errors in static analysis
9bf50e6 better knowledge in the importer where the import names originate from
87704ec custom message capability for analysis
11b7f9f decorators should also be included in the static analysis
0f7a170 static analysis start positions are now tested
552502a list comprehension static analysis test
4e59606 test for is_nested failure
8e27ed5 fix returns/flow command edge cases
d59e21f new way of gathering statements to evaluate for static analysis
857a9b7 don't raise attribute NameErrors in all for loop name definitions.
bcab821 linter output changes - #408
b54d463 recursive file paths for the temporary linter api - #408
5e2bb0e Using python -m jedi force <path> you can use the linter for now.
99340dd few NameError tests
9bcc4f8 static analysis is now able to tell the difference between NameError/AttributeError
7632a7d sorting the statements for analysis. we need to be able to reproduce results.
876942d Small adjustment in Interpreter completion to be compatible with static analysis
a2b483b None issue fix for static analysis
00e43d4 except can also catch multiple exceptions in one statement
7096a57 try/except test for static analysis (duck typing should not cause jedi to report mistakes)
96386b4 if something catches an exception, ignore that report
64af952 simple generator static analysis subscript check
b6ec589 refactor general array lookup method get_index_types
70d85d1 strip_imports -> follow_imports
e5fe726 imports cleanup & documentation
02d1e1a fix static analysis for nested imports
13949ec move is_nested check from evaluate.imports to the parser
04855e9 pytest -> ignore static_analysis folder
6315580 interpreter cleanup, use proper parents
3f2e737 statical analysis shouldn't report the exact same error twice
7abdc37 add tests for attribute errors
284a64a more import-error detection tests
7b52528 static analysis import tests
c92113a improved static analysis test base
40a5496 testing structure for static analysis.
c59a8dc ImportError detection
586ac9d removed a few debug things.
11a445a Merge branch 'dev' into linter
6097124 star imports now have their own class, which will be important for AttributeError detection
358472b improved star import support preparation
ecfb3a0 Merge branch 'dev' into linter
d0b2a2c fixed NestedImportModule
2d48c72 introduce a NestedImportModule class
6098ba5 small fixes to the analysis.Error class.
1ecb173 update AUTHORS
7c965e5 dive further into following imports, etc
9f35429 fix virtualenv support
9eb75f9 static analysis prototype decription
c0064e1 Merge pull request #406 from davidhalter/repl_info
ae8b0d5 Print the Jedi version when REPL completion is used

git-subtree-dir: .vim/bundle/YouCompleteMe.vim/python/ycm/completers/python/jedi
git-subtree-split: 68378a146828a9521f7ac1c0f02d2a95abf3fac3
Merge commit 'a7540e6d954360d841c4a7eb648a80202edd12a9'
Squashed '.vim/bundle/YouCompleteMe.vim/third_party/bottle/' changes from 3ec966b..12b424c

12b424c Merge pull request #690 from eric-wieser/stpl-comprehensions
642e8b1 Fixed link to twitter in docs.
8f42700 Fixed bug where BaseResponse.copy() would not copy Cookies due to a behaviour change in newest Python 3.x releases.
8a5bfe2 Prevent syntax errors when line-wrapping comprehensions
db0262e Clean up STPL voodoo
2201e07 Revert changes I committed accidently. Meh...
cea519c Changed all links to the official repository.
58e6608 Fixed mixed types in BaseResponse.headerlist in Python2
ba7be6d Merge pull request #683 from njogun/master
7c23136 Add test for Windows-style line endings (CRLF ie \r\n) in template when using multiline code block
40fa1ca Fix end-of-code-block template token regex
e043aeb Merge pull request #682 from avelino/added_image_build
9b2462d Added travis image build status
7859441 Merge pull request #681 from avelino/413_description_RFC2616
dae51d7 fix status code 413 description as RFC2616 10.4.14 413 Request Entity Too Large ............................69 https://www.ietf.org/rfc/rfc2616.txt
ff7f4db Merge pull request #669 from zvxr/master
9530681 Merge pull request #673 from jeorgen/mimetype_from_download
425d336 Merge pull request #677 from jhargis/typo_fix_625
85b8e9b Merge pull request #679 from avelino/tutorial_grammatical_corrections
35853b8 fix typo tutorial grammatical corrections
87056f2 fixed typo in doc
d029883 Get mime type from download, if download is a file name
cb7a333 typo fix
d65c4e1 Merge pull request #625 from colin4124/patch-1
aa63ca9 Merge pull request #635 from lordjabez/quiet-waitress
c22eddd Merge pull request #658 from mengzhuo/master
43f3b7a Merge pull request #660 from mjordan/master
ddc9716 Merge pull request #662 from eric-wieser/patch-1
6f31377 Merge pull request #666 from krysros/master
d18b687 Merge pull request #667 from sepus/master
5288ccb Fixing Travis-CI builds for python 2.5
ba10495 typo "to handy"
c0b3c0d Fixed py3k bug with unicode headers.
58494ce Update to new rule syntax
9281f03 ConfigDicht.setdefault should return something.
8295f1a Fixed wheel distribution support
bb05e24 Fixed bootstrap for 2.5
5fc8b18 Fix typo
622ee60 Merged test_config and test_configdict
60949ba Addresses #659.
2efe2d7 fix coverage break gevent/eventlet testcase
abf1e4f Merge pull request #657 from mengzhuo/master
12f70a8 fix "Request to Large" typo
fe72858 Merge pull request #648 from wbond/master
aaef83b Fix except syntax for Python 2.5
e4ff4b4 Merge pull request #650 from patamushta/master
8c909e4 _hkey in WSGIHeaderDict for unification
c4ea59e Suppress ResourceWarning unclosed socket message
03865a3 Add @lordjabez as an author.
c57ef1a Pass quiet flag on to waitress.
dee9c31 Merge pull request #634 from FedericoCeratto/patch-5
6fb03c2 Add PyPI badges
bc312ae Workaround for #632: PyPy incompatible to CPython re-module.
d709bfa fix #633: SimpleTemplate \% dropping leading space
ed47f10 Fixed/reverted broken pull request #631
879bbfa Merge pull request #631 from ericfrederich/actual_port
3311520 report back actual port when using port 0
21a2d4a typo tutorial.rst

git-subtree-dir: .vim/bundle/YouCompleteMe.vim/third_party/bottle
git-subtree-split: 12b424c0e8061edc384a40d747e09f188b5eaaab
Merge commit '1774911f9eb2243b69901e78a3c8b0b5e310bdf4'
Squashed '.tmux/tmux-powerline/' changes from 19afd88..90ce027

90ce027 Merge pull request #192 from MarkBorcherding/typo-in-comments
c517986 fix type in rcfile comments
8d2e6f7 Merge pull request #187 from taizilongxu/master
efc2e2d add M/s for speed if larger than 1024k

git-subtree-dir: .tmux/tmux-powerline
git-subtree-split: 90ce02753be1f4f5e7e11e570f2c7e5977b355ee
Merge commit '35457feb2fa0304d1c6ffc765371c49cee3a7ac1'
Squashed '.vim/bundle/breeze.vim/' changes from 8bb6d28..d95d90e

d95d90e Set the mark ' when jumping to tags or attributes
7d1d271 Don't set the mark ' while iterating through tags or attributes
d5c3a60 Use spaces
b28d24a Fix backward jumps
03f8a42 Fix line highlighting
af965dc Update README.md
a54a428 Remove unnecessary abstractions
ae515e3 Implement more abstract functions
5d82656 Update docs
f099fca Remove deprecated commands
a7ea0a3 BreezeHighlightLine => BreezeHighlightedLine
50cda04 Change default highlight group for highlighted lines
4ec39dc Minor refactoring
687c371 Update docs
9e2c0bd Update docs
afb1f3d Add ability to highlight the current line after a direct jump
8cfe333 Add ability to directly move to tags or attributes
c4d30f1 Minor refactoring
7f81098 Allow the use of line continuations
72f3317 Make functions local to the script
d069ff1 Minor refactoring
c059895 Fix documentation
4a42558 Restore commands for backward compatibility
0df9f5c Add g:breeze_version
8952cb3 Fix matching of opening tags
07c4fbf Ignore comments
4602e57 Update README.md
022d9d2 Update preview.gif
f717c39 Improve documentation
206c337 Tell the user how to change default colors
949a9be Add gif
e4718eb Fix typos
d6e68fc Breeze 3.0

git-subtree-dir: .vim/bundle/breeze.vim
git-subtree-split: d95d90ea7e093e3f472fb15ee2a032a570fc528a
Merge commit '7a5df5b32599f4c894510c5968fa3dd66eb98e56'
Squashed '.vim/bundle/textobj-user.vim/' changes from 96aeac3..9aa5fd0

9aa5fd0 Merge branch 'prepare-for-0.6.4'
7c71aa6 Bump up version to 0.6.4
69b6eb4 Add release notes on 0.6.4
2bf18f7 Merge branch 'fix-single-character-objects'
ff8d4f8 Fix to correctly select a single-charcter object
b6ae440 Add tests for single-character objects
5256321 Merge branch 'fix-readme'
156a6b6 Fix example key mappings to match description
2ff5ddd Merge branch 'fix-failures-on-travis-ci'
39bb7df Use to_be_snr_prefix
41d9148 Add to_be_snr_prefix
5d3c8ce Merge branch 'prepare-for-0.6.3'
267faa3 Bump up version to 0.6.3
ac6e1b6 Add release notes on 0.6.3
c78aa29 Merge branch 'fix-snr-prefix-in-verbose-mode'
838d7d1 Fix s:snr_prefix to work also in verbose mode
9a284dc Add tests on s:snr_prefix in verbose mode
ae7b306 Declare using vim-flavor 2.0 or later

git-subtree-dir: .vim/bundle/textobj-user.vim
git-subtree-split: 9aa5fd050ecce650fb7ff018397e73a66a41c76b
Merge commit 'dfc7895f3d2f3af8472c5b4d97cc634905d9b5bd'
Squashed '.vim/bundle/YouCompleteMe.vim/third_party/requests/' changes from 7022830..2d1ffad

2d1ffad Merge pull request #2390 from Lukasa/cookiedocs
101425e Enhance documentation for clarity.
f4ec3d2 Clean up cookie docs and display them.
b831317 Bump version to 2.5.1
ce5b5fe Add release notes for 2.5.1
eccbf4a Merge pull request #2389 from sigmavirus24/bug/fix-digest-auth
86c3ecf Fix bug in renegotiating a nonce with the server
bd3cf95 Fix error handling on Python 3
386c589 Merge branch 'master' of https://github.com/ContinuousFunction/requests into pr/2344
f723ab5 Merge pull request #2382 from daftshady/exception
925e975 catch exception more specifically in Response.ok
4c61fef Uncommented test in test_requests.py
39090cf Merge branch 'master' of https://github.com/kennethreitz/requests
d7c0249 Merge pull request #2381 from namlede/patch-1
01b58ba Fix a typo in a comment
a8205bb Merge pull request #2379 from arthurdarcet/master
e8d02ea utils.guess_filename fails if the given parameter looks like a file object but has a non-string name attribute
e23bf10 Merge pull request #2374 from krvc/fix_link
508f4b1 Updated the broken link to twitter streaming API documentation
1d9bf43 Merge pull request #2373 from frewsxcv/patch-1
bf2e735 Enable GitHub syntax highlighting on README
4e90aa7 Merge pull request #2363 from sigmavirus24/fix-tests
f172b30 Merge pull request #2365 from sigmavirus24/release/2.5
33b2517 Bump version to 2.5.0
9a0ce93 Add updates for 2.5.0
cf82d44 Update tests to work offline
90857b8 Merge pull request #2216 from sigmavirus24/retries-take-2
7aa6c62 updatee chardet, urllib3
53d0238 Merge pull request #2349 from sigmavirus24/fix-pickling
8ae4d02 Merge pull request #2348 from danmichaelo/master
1c4a666 Merge pull request #2353 from mattrobenolt/patch-1
2a5364c url was already parsed, don't urlparse twice
c8baf88 Properly serialize RecentlyUsedContainers for cache
3246b1f Changed ConnectionError to InvalidURL
8b03f60 Docs: Add more section labels for referencing
087a27a Partially addresses Issue #1572
adf475e Update HTTPAdapter docstring
2eb7e3c Add last few changes and add a quick test
f54a4e3 Update urllib3 to df4ec5cce1
2bc7762 Update how we handle retries to be consistent with documentation
9dc6602 Merge pull request #2309 from sigmavirus24/add-deprecation-warnings
1601387 Merge pull request #2308 from kevinburke/read-timeout-retry
45ef1f8 Merge pull request #2332 from asnelzin/fix-2329
e4ddca0 Merge pull request #2326 from sigmavirus24/close-functional-sessions
19b8e30 Merge pull request #2333 from akitada/reinit-pos
67c5057 Fix HTTPDigestAuth not to treat non-file as a file
ee50afe Fixed.
34f6088 Added test for overriding Content-Length.
431282e Merge pull request #2299 from mattrobenolt/master
3155bc9 Close sessions created in the functional API
1c52d15 Merge pull request #2323 from Lukasa/strict
f28bde7 Pass strict to urllib3.
122c92e Merge pull request #2253 from yossigo/digest_redirect_fix
124c094 Merge pull request #2317 from sigmavirus24/bug/2316
29ef108 Use to_native_string instead of builtin_str
a703e24 Update documentation about max_retries to reflect code
387c8f8 Cap the redirect_cache size to prevent memory abuse
091991b Merge pull request #2306 from ssadler/fix-failing-test-test_prepare_unicode_url
d505b94 Add DeprecationWarnings to inform users of plans
f2f3bde Note about read timeout errors and max_retries
583859b fix failing test "test_prepare_unicode_url" \(take 3\)
8e69c9f Revert "fix failing test "test_prepare_unicode_url""
26ed7c2 fix failing test "test_prepare_unicode_url"
77687de Revert "fix failing test "test_prepare_unicode_url""
be805f9 Merge pull request #2295 from 2deviant/feature-custom-newline
c044a70 update AUTHORS
cfd6e25 fix failing test "test_prepare_unicode_url"
3602690 Changing parameter name `newline` ==> `delimiter`.
3d8823c Clean up handle_redirect.
f5ff05b Adding a custom line delimiter to iter_lines()
6b58a35 Merge pull request #2290 from syedsuhail/fix-2282
96efb5e Fix #2279. Update layout css
e1e1855 Merge pull request #2289 from syedsuhail/fix-2288
3a6348d Fix #2288. Change urllib3 and chardet workflow
f7ecad8 Merge pull request #2282 from morganthrapp/patch-1
4d498db Update sidebarintro.html
c41eb27 Merge pull request #2273 from sigmavirus24/add-changelog-to-sidebar
2ac771b Merge pull request #2271 from mikecool1000/fix-2250
8339b60 Made more better
589f2f6 Add Release History to the sidebar
ce1ac88 Fixed #2250
4594667 Update utils.py
6ff6f75 Clean up, support all redirects, fix potential endless 401 loop.
46d6460 v2.4.3
78d12bb v2.4.3
6da438d Merge pull request #2268 from sigmavirus24/fix-params
4ec26da Merge pull request #2267 from minrk/unicode-url-py2
0e4efab Re-order params for backwards compat
ca2ebc5 allow unicode URLs on Python 2
5850b1f Merge pull request #2249 from t-8ch/fix_2247
779c001 requests v2.4.2
79f56e2 fix documentation for utils.get_unicode_from_response() :)
90dc467 v2.4.2 changelog
65cdccb Merge pull request #2241 from tijko/master
1e79cf6 Merge pull request #2258 from willingc/add-json
20ca9fe Merge pull request #2265 from sigmavirus24/session-attrs
b1f3a2d Remove timeout from __attrs__
e74791d Merge pull request #2238 from buttscicles/byte-urls
8ed941f Fix a couple of issues I noticed
a68d1b4 Support bytestring URLs on Python 3.x
c28da22 A fix for #1979 repeat HTTP digest authentication after redirect.
cd5eb62 remove unused import
6e1db21 fix #2247
a718a81 Merge pull request #2248 from jktjkt/docs-CAs
3635b15 docs: Clarify how to pass a custom set of CAs
de76fbe Merge pull request #2244 from sigmavirus24/bug/2231
e0d88c2 Merge pull request #2245 from sigmavirus24/doc-fix
671ba85 Correct redirection introduction
ac44b48 Avoid getting stuck in a loop
64ba451 make StreamConsumedError doubly inherit
6e5f7bb using the `StreamConsumedError`
58e0a6f add-in StreamConsumedError
d647087 rm `else` after `if` then `raise` block
fdf932c raise RuntimeError when a single streamed request calls *iter methods than once
d28d45a Merge pull request #2237 from buttscicles/contributing-update
d243668 Remove invoke from requirements.txt, docs
466a70f Fixup the remaining references to timeline.json.
082c8d0 Merge pull request #2227 from mjul/master
0924069 Moved multiple files upload example to advanced section.
4707d11 Added example of how to send multiple files in one request.
9b41308 Merge pull request #2223 from blueyed/doc-followup-2222
bff8b91 Document skipping in PreparedRequest; followup to #2222
1a44a99 Merge pull request #2222 from blueyed/fix-MissingScheme-for-hostport
d3566ee Add more tests to `test_invalid_url`
9e8702d lawl
27b6bfc mils
dff383c requests v2.4.1
5e94c81 Merge pull request #2210 from sigmavirus24/bug/2207
2416e23 Merge pull request #2213 from kennethreitz/req-rsp
bf8f791 Request->Response.
27c83f7 Fix #2207
359659c Merge pull request #2203 from Lukasa/remove_certifi
9c6ae1d Link to Mozilla trust store.
0df32de Merge pull request #2199 from mtorromeo/patch-1
a77054f Remove hard certifi dependency and document.
1324ca1 Merge pull request #2193 from sigmavirus24/bug/2192
209a871 Merge pull request #2191 from kevinburke/comma
07bbe21 Merge pull request #2187 from kevinburke/more-docs
958845a requests[security]
bc25604 Merge pull request #2195 from sigmavirus24/betterssl
9354855 Consolidate error handling
226b5c7 Open README and HISTORY as utf-8 encoded files (fixes #2196)
ce7957c Add test for invalid port
c6a1167 Merge remote-tracking branch 'kevinburke/domain-failure-connection-error' into bug/2192
c809867 Add betterssl extra
2c76122 Add test that invalid domain raises a ConnectionError
da12223 Capture and re-raise urllib3 ProtocolError
34ea836 tildes
59f5a10 add trailing comma
81d6b3e s/behavior/behaviour
dfa41af Document Timeout behaviour
95161ed v2.4.0 changelog
1fcda91 Revert "Documentation update : connection keep alive"
0713e09 Fixes typo in test
402f3b4 Changes check on base and json. Fails on tests.
b34a496 Adds review changes
8f17741 Adds json parameter for POST requests
d22b8d8 3.4 classifier
d33ce49 keep-alive
89cb408 v2.4.0
5f48336 Merge pull request #2178 from sigmavirus24/env-retrieval
7e24176 Merge pull request #2183 from Lukasa/docupdate
08d8876 Remove timeline.json from docs.
596ca83 Update verify check and doc-string
b4a7906 Add Session method to merge environment settings with per-request settings
7a09e72 Merge pull request #2174 from kevinburke/test-clarification
32e403a Merge pull request #2176 from kevinburke/connect
c879873 Merge pull request #2179 from kevinburke/urllib3-pypy-ssl
8bbc4fc Updates urllib3 to 528ad3c
7f236fc woops
39b3a43 assert connect timeout inheritance
8f9ce13 ConnectTimeout multiple inheritance
f0b9b60 revert change
c2aeaa3 Add support for connect timeouts
024db27 clarify comment
e70179a Clarify which tests to run in the Makefile
c0322e4 Merge pull request #2172 from ContinuousFunction/master
1c20d01 Cleanup grammar from previous commit.
391e064 Merge pull request #2173 from tychotatitscheff/master
1b26023 Documentation update : connection keep alive
337b338 Adding my name to authors
5aa1881 Adding myself to authors.
8bb8a9a Adding my name to authors.
c7e087c Added space and sentence case
aa6650a Merge pull request #2168 from ContinuousFunction/master
2fc6e8a Update on Tracking Previous Requests
53d3cec 21m
df641e7 Tracking Previous Requests
35d083e Merge pull request #2153 from jschneier/master
47d0517 handle urllib3 api changes; closes #2045
3eb69be Merge pull request #2148 from romanlevin/handle-socket-error-in-iter_content
cf01a74 Replace setattr
9eab9f7 Handle socket errors in iter_content
fe693c4 Merge pull request #2142 from sigmavirus24/urllib3-1.9
9575d6a Merge pull request #2145 from TkTech/patch-1
35f7bcd Update faq.rst
57b8611 Update faq.rst
eb2906a Merge pull request #2140 from dpursehouse/linkify-usernames
170d626 Fix test bug courtesy of @shazow
811ee4e Upgrade urllib3 to 1.9.x
e66466a Merge pull request #2141 from esparta/master
698b93b Docs: Using print() function instead print command on advanced & quickstart user docs
eef4e08 Add links to Twitter accounts
4c94282 Merge pull request #2139 from dpursehouse/line-wrapping
743f382 Linkify Github usernames in authors list
44e426e More line wrapping
587a515 Merge pull request #2138 from dpursehouse/more-doc-updates
be453ba Remove empty 'internals' page
1785278 Remove redundant sentence from quickstart introduction
c6fa5bb Fix a couple more malformed :meth: and :class: links
49ecffb Add authentication classes to the API document
999ba496 Merge pull request #2136 from dpursehouse/greenfeld-not-greenfield
f0fb20c Fix name misspelling
e25fbc8 Merge pull request #2135 from dpursehouse/fix-meth-and-class-directives
2a6303e Docs: Fix :class: and :meth: directives
d21916c Merge pull request #2134 from nonZero/patch-1
54fc807 Merge pull request #2133 from esparta/master
6dc13f2 removed unneeded parentheses from if clause
127ab0a Merge pull request #2131 from dpursehouse/quickstart-doc-updates
a8a4c98 Restructure "Redirection and History" section in quickstart documentation
f5a2138 Minor tidy-ups in quickstart documentation
cde5a4a Add Timeout exception in API documentation
55df629 Merge pull request #2130 from dpursehouse/doc-index-updates
504b960 Documentation: Add Sony to list of users
d9ea1aa Documentation: Wrap lines in index.rst
28d1ef5 Merge pull request #2128 from tshepang/patch-1
36b6c37 Fix broken link
e48b4b4 Merge pull request #2124 from Lukasa/certifi
52facc7 Install certifi with requests.
7a51337 Preferentially use certifi to requests.
291bc9e Update link to pip site on docs/user/install.rst
39f0c66 Merge pull request #2115 from sigmavirus24/fix-2092
3957b0b Fix silly check
538a41e Merge pull request #2116 from sigmavirus24/fix-2107
d25280d Replace dead link with StackOverflow answer
84f6737 Update how we check verify when inspecting env variables
de2cd2e Merge pull request #2112 from np-csu/patch-1
1bf4af6 Update quickstart.rst
b9bbfa6 Merge pull request #2049 from codedstructure/adapter-proxy_manager_for
fcb735f Merge pull request #2097 from bkerensa/patch-1
c451dd2 Update out-there.rst
6b21e5c Merge pull request #2095 from ericfrederich/redirect_cache
493697a Merge branch 'master' into redirect_cache
c3444f8 don't make duplicate requests for permanent redirects
2c262de Merge pull request #2090 from ericfrederich/fix_308
b80ed77 Update index.rst
da3178f Re-add resume to not break existing apps as requested by Cory Benfield
ec3a2e6 rename resume/resume_incomplete to permanent_redirect according to rfc7238
07d9b73 handle 308 redirection the same as 301 and 302
743ce81 Merge pull request #2088 from jeffknupp/master
bff65f4 Update with style considerations by @kennethreitz
e2c4da7 various pep-8 cleanups; remove unsused imports; remove unused variables
3ee781b Merge pull request #2076 from Lukasa/basic
326f6ad Merge pull request #2087 from Lukasa/2616
046302c indentation change for code review
2b8353d Avoid unnecessary encode/decode cycles.
d977ee8 Force basic auth strings to native string type
2243316 Update trivial mentions to RFC 2616.
54e96b4 allow pool_kwargs to be specified in init_poolmanager
02618c8 improve `proxy_manager_for` re-usability by subclass
e3d0ac7 update AUTHORS.rst
f97e787 Factor out HTTPAdapter.proxy_manager_for for #2048

git-subtree-dir: .vim/bundle/YouCompleteMe.vim/third_party/requests
git-subtree-split: 2d1ffad80bdfbefcb1922e0129fca28d493d3fb0
Merge commit '37ffd00b7a35e4d99daf8859fa932584b9314a1c'
Squashed '.vim/bundle/jsbeautify.vim/' changes from 6e89ff0..8d0daf4

8d0daf4 Merge pull request #73 from sahands/master
564cde7 Improving README.md so it reads a little nicer :)
fdd1ba0 chore: the last attempt to fix travis tests for node@0.8
68caf42 Merge branch 'master' of https://github.com/maksimr/vim-jsbeautify
d2eb16f chore: fix travis build
bf6f395 chore: Add information about manually installing
aa899f0 add output for travis
0e6a930 install depot_tools for v8 on travis
a280bd1 chore: Update js-beautify dependency (close #62)
5171334 travis: update npm before test
b27e919 Merge pull request #59 from jetz/pr
6c135eb Node may be called nodejs in some platform. Fixed
8aeaa62 Merge pull request #57 from maksimr/issue-51
bdc0c4d Support for Json files as well (close #51)
6668f7d Add support jsx files (close #55)

git-subtree-dir: .vim/bundle/jsbeautify.vim
git-subtree-split: 8d0daf42c10fa67974e34282f2f8ef55e44e5716
Merge commit '36cd6eef66f88dfcc3c31a35e97aeceadfcc1d25'