aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* vim-patch: 7.4.1086 #4626Michael Ennen2016-05-06
| | | | | | | Problem: Crash with an extremely long buffer name. Solution: Limit the return value of vim_snprintf(). (Dominique Pelle) https://github.com/vim/vim/commit/507edf63df75fe228e0f76b845b58d60266e65d8
* Windows: find_file_in_path: Handle absolute path. #4711Michael Ennen2016-05-06
| | | | Originally in vim/vim.
* Merge pull request #4712 from jamessan/runtime-patchesJustin M. Keyes2016-05-06
|\ | | | | vim-patch:{40a346d,89b24fc,27a82e3}
| * version.c: Mark 7.4.1005 as NA, per discussion in #4191James McCoy2016-05-05
| |
| * vim-patch:27a82e3James McCoy2016-05-05
| | | | | | | | | | | | Add new file left out from patch 7.4.1034. https://github.com/vim/vim/commit/27a82e31ee9acedb6922093b2764f7f6860b0f91
| * vim-patch:89b24fcJames McCoy2016-05-05
| | | | | | | | | | | | Update ignored files. Delete file that should have been deleted by patch 7.4.1016. https://github.com/vim/vim/commit/89b24fcfc2250d3ccb2f96c61911d9ad0020756b
| * vim-patch:40a346dJames McCoy2016-05-05
|/ | | | | | Update gitignore for files created when running tests. https://github.com/vim/vim/commit/40a346dc19a75f2be1b2d491053487cf365dd7d4
* Merge pull request #4540 from KillTheMule/vim-patch-1236Justin M. Keyes2016-05-04
|\ | | | | vim-patch: 7.4.1236
| * vim-patch:7.4.1236pips.linux2016-04-28
| | | | | | | | | | | | | | | | | | | | | | Problem: When "syntax manual" was used switching between buffers removes the highlighting. Solution: Set the syntax option without changing the value. (Anton Lindqvist) https://github.com/vim/vim/commit/885f24fbcae2a39ae496ffb3a1e139379be8fae1 Patch applied cleanly to the nvim sources except for version.c.
* | Merge pull request #4677 from KillTheMule/vim-7.4.889Justin M. Keyes2016-05-04
|\ \ | | | | | | vim-patch:7.4.889
| * | vim-patch:7.4.889KillTheMule2016-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Triggering OptionSet from setwinvar() isn't tested. Solution: Add a test. (Christian Brabandt) https://github.com/vim/vim/commit/74b738d414b2895b3365e26ae3b7792eb82ccf47 Mark 7.4.889 as merged Done in https://github.com/neovim/neovim/commit/9bd8fcde1e82cb535abe46ff508de7029d8f686e
* | | Merge pull request #4644 from KillTheMule/vim-7.4.882Justin M. Keyes2016-05-04
|\ \ \ | | | | | | | | vim-patch:7.4.882
| * | | Even though the patch is not needed for neovim, add a test for the bugfixKillTheMule2016-04-29
| | | |
| * | | vim-patch:7.4.882KillTheMule2016-04-29
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: When leaving the command line window with CTRL-C while a completion menu is displayed the menu isn't removed. Solution: Force a screen update. (Hirohito Higashi) https://github.com/vim/vim/commit/5f1fea28f5bc573e2430773c49e95ae1f9cc2a25 Applied manually.
* | | Merge pull request #4678 from KillTheMule/vim-7.4.672Justin M. Keyes2016-05-04
|\ \ \ | | | | | | | | vim-patch:7.4.672
| * | | Add test for vim-patch 7.4.672KillTheMule2016-05-02
| | | |
| * | | Linting.KillTheMule2016-05-02
| | | |
| * | | vim-patch:7.4.672KillTheMule2016-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: When completing a shell command, directories in the current directory are not listed. Solution: When "." is not in $PATH also look in the current directory for directories. https://github.com/vim/vim/commit/b5971141dff0c69355fd64196fcc0d0d071d4c82 Most of it applied manually.
* | | | Merge pull request #4704 from KillTheMule/vim-runtime-patches-allJustin M. Keyes2016-05-04
|\ \ \ \ | | | | | | | | | | vim-patch:{a0f849e, d7464be, b4ff518, e392eb4, d042dc8, 2c5e8e8, 256972a, cc7ff3f}
| * | | | Fix typo that seems to have been around foreverKillTheMule2016-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Could not find when it was fixed in the vim source, it originates in 7.001, and is fixed as of today, but my git-fu did not discern a relevant patch. I don't think it matters much.
| * | | | vim-patch:cc7ff3fKillTheMule2016-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update English spell files. https://github.com/vim/vim/commit/cc7ff3fcd8c8fd7da6faac98a138b830ec5c00d8 NA for neovim, included so the scripts can pick that up.
| * | | | vim-patch:256972aKillTheMule2016-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated runtime files. https://github.com/vim/vim/commit/256972a9849b5d575b62a6a71be5b6934b5b0e8b Missing files in runtime/doc: todo.txt, tags. Patch to runtime/doc/syntax.txt was applied manually in part, for no discernible reason.
| * | | | vim-patch:2c5e8e8KillTheMule2016-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated runtime files. https://github.com/vim/vim/commit/2c5e8e80eacf491d4f266983f534a77776c7ae83 Missing files in runtime/doc: if_ruby.txt, tags, todo.txt. Ignored changes to runtime/syntax/vim.vim.
| * | | | vim-patch:d042dc8KillTheMule2016-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update runtime files. https://github.com/vim/vim/commit/d042dc825c9b97dacd84d4728f88300da4d5b6b9 Missing in runtime/doc: hangulin.txt, tags, todo.txt. The changes to options.txt do not apply for nvim. man.vim is very different in nvim, some changes applied manually, others discarded.
| * | | | vim-patch:e392eb4KillTheMule2016-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update runtime files. https://github.com/vim/vim/commit/e392eb41f8dfc01bd13634e534ac6b4d505326f4 Files runtime/doc/tags and runtime/doc/todo.txt did not exist. Ignored runtime/syntax/vim.vim. One change in runtime/doc/windows.txt had already been applied.
| * | | | vim-patch:b4ff518KillTheMule2016-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated runtime files. https://github.com/vim/vim/commit/b4ff518d95aa57c2f8c0568c915035bef849581b Missing files: runtime/doc/tags, runtime/doc/todo.txt. Changes to runtime/doc/if_pyth.txt, runtime/doc/options.txt and runtime/doc/quickref.txt did not aply. Excluded runtime/syntax/vim.vim.
| * | | | vim-patch:d7464beKillTheMule2016-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated runtime files. https://github.com/vim/vim/commit/d7464be9747fcaa8e6210e1f00a3882932df76e2 Applied cleanly except for runtime/docs/todo.txt and runtime/docs/tags.
| * | | | vim-patch:a0f849eKillTheMule2016-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update runtime files. https://github.com/vim/vim/commit/a0f849ee40cbea3c889345256786b640b0becca2 Missing files runtime/doc/tags and runtime/doc/todo.txt. Excluded runtime/syntax/vim.vim, since we diverged quite a bit from vim in this file.
* | | | | Merge pull request #4680 from equalsraf/tb-windows-winsock2Justin M. Keyes2016-05-02
|\ \ \ \ \ | |_|/ / / |/| | | | Windows: Include winsock2.h before windows.h
| * | | | Windows: Include winsock2.h before windows.hRui Abreu Ferreira2016-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | winsock2.h is incompatible with winsock.h (included by windows.h) and must be included first. For reference see https://msdn.microsoft.com/en-us/library/windows/desktop/ms737629%28v=vs.85%29.aspx
* | | | | Merge pull request #4688 from ZyX-I/clint-checksJustin M. Keyes2016-05-01
|\ \ \ \ \ | |_|/ / / |/| | | | Add check for boolean operators placement
| * | | | *: Fix new linter errorsZyX2016-05-01
| | | | | | | | | | | | | | | | | | | | Originally there were 128 new errors, so I thought this is a good idea to fix all of them. Of course, this commit also fixes many suppressed errors.
| * | | | clint: Check that boolean operator is placed on the next lineZyX2016-05-01
|/ / / / | | | | | | | | | | | | I have not found in the style guide words about other operators, so they are not tested. This adds 128 new errors.
* | | | Merge pull request #4681 from equalsraf/tb-msvc-varmacrosJustin M. Keyes2016-05-01
|\ \ \ \ | | | | | | | | | | MSVC: Avoid variadic macro bug in STATIC_ASSERT
| * | | | MSVC: Avoid variadic macro bug in STATIC_ASSERTRui Abreu Ferreira2016-04-30
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC does not handle __VA_ARGS__ as expected in STATIC_ASSERT, avoid its use to work around it since we don't need it. The underlying issue seems to be one of https://connect.microsoft.com/VisualStudio/Feedback/Details/1232378 https://connect.microsoft.com/VisualStudio/Feedback/Details/1099052 The bug only seems to manifest when using multiple variadic macros that call each other.
* | | | Merge pull request #4597 from bfredl/motionBjörn Linse2016-05-01
|\ \ \ \ | |/ / / |/| | | convert MCHAR operator and register types to enum MotionType
| * | | normal: convert MCHAR etc operator and register types to enum MotionTypeBjörn Linse2016-05-01
|/ / /
* | | Merge pull request #4676 from ZyX-I/fix-hist_char2type-crashJustin M. Keyes2016-04-30
|\ \ \ | | | | | | | | ex_getln: Do not crash with :append/:insert/:change
| * | | ex_getln: Do not crash with :append/:insert/:changeZyX2016-04-29
| |/ / | | | | | | | | | | | | | | | | | | This change effectively disables history for lines inserted using this method. Not a big problem since it does not work for them in Vim in first place. Also solves a bug(?): ex_window() run while in :append mode opens search history in Vim for some reason. Now it opens empty cmdline window.
* | | Merge pull request #4679 from equalsraf/tb-windows-lcJustin M. Keyes2016-04-29
|\ \ \ | | | | | | | | Windows: without libintl use LC_CTYPE instead of LC_MESSAGES
| * | | Windows: without libintl use LC_CTYPE instead of LC_MESSAGESRui Abreu Ferreira2016-04-29
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If libintl is not available, LC_MESSAGES is not defined. For now fallback to using LC_CTYPE. Neovim and Vim have diverged significantly in ex_cmds2.c concerning this logic. In other locations the fallback is actually LC_COLLATE, but in this case Vim calls get_mess_env() (which in turn falls back to LC_CTYPE). In Neovim get_mess_env() is only available with libint. This means we are not completely consistent with Vim when handling LC_ environment variables and do not build against libintl.
* | | Merge pull request #4675 from barraponto/patch-1Justin M. Keyes2016-04-29
|\ \ \ | |/ / |/| | Increase readability of unit conversion.
| * | Increase readability of unit conversion.Capi Etheriel2016-04-29
| | |
* | | Merge pull request #4674 from equalsraf/tb-include-fcntlJustin M. Keyes2016-04-29
|\ \ \ | |/ / |/| | Add missing include fcntl.h
| * | Add missing include fcntl.hRui Abreu Ferreira2016-04-29
|/ / | | | | | | In Windows, open() flags like O_RDONLY need fcntl.h.
* | Merge pull request #1112 from justinmk/os_nodetypeJustin M. Keyes2016-04-29
|\ \ | | | | | | os_nodetype: impl with libuv
| * | os_nodetype: impl with libuvJustin M. Keyes2016-04-29
|/ /
* | Merge pull request #4670 from equalsraf/tb-remove-unix-guardJustin M. Keyes2016-04-28
|\ \ | | | | | | Remove old UNIX ifdef from buf_write()
| * | Remove old UNIX ifdef from buf_write()Rui Abreu Ferreira2016-04-28
|/ / | | | | | | | | | | | | | | | | | | | | When backupcopy=auto buf_write assumes backupcopy=yes when the file is a hard/symbolic link. However this check was guarded by a UNIX ifdef. The check itself is portable and the guard can be removed. Added a couple tests to check the behaviour of bkc=auto and bkc=no with a symbolic link. Reported in #4525
* | Merge pull request #4668 from fwalch/archlinux-filetypesJustin M. Keyes2016-04-28
|\ \ | |/ |/| Runtime: Re-add support for Arch Linux PKGBUILDs.