aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
...
* | | | | | Merge pull request #4733 from AdnoC/hi-link-cleared-groupJustin M. Keyes2016-05-12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linking a cleared highlight group Closes #4549 Closes #2756 Closes #4236
| * | | | | | syntax: Allow cleared highlight groups to be linkedAdnoC2016-05-10
| |/ / / / /
* | | | | | Merge pull request #4729 from jbradaric/vim-7.4.1047Justin M. Keyes2016-05-12
|\ \ \ \ \ \ | | | | | | | | | | | | | | vim-patch 7.4.1047, 7.4.1048, 7.4.1049
| * | | | | | vim-patch:7.4.1049Jurica Bradaric2016-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Wordcount test still still fails on MS-Windows. Solution: Set 'fileformats' to "unix". https://github.com/vim/vim/commit/485dace817a99f4cf92a598845d27c8ee685df93
| * | | | | | vim-patch:7.4.1048Jurica Bradaric2016-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Wordcount test still fail on MS-Windows. Solution: Set 'fileformat' to "unix". https://github.com/vim/vim/commit/c7803a1c42228566ee2e2efcd621b21d0a8ed3ea
| * | | | | | vim-patch:7.4.1047Jurica Bradaric2016-05-10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Tests fail on MS-Windows. Solution: Set 'selection' to inclusive. https://github.com/vim/vim/commit/7f68203168aeb22fcf8a5a9680503fe16759ebd4
* | | | | | Merge pull request #4730 from jbradaric/vim-7.4.1052Justin M. Keyes2016-05-12
|\ \ \ \ \ \ | | | | | | | | | | | | | | vim-patch:7.4.1052
| * | | | | | vim-patch:7.4.1052Jurica Bradaric2016-05-10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Illegal memory access with weird syntax command. (Dominique Pelle) Solution: Check for column past end of line. https://github.com/vim/vim/commit/04bff88df6211f64731bf8f5afa088e94496db16
* | | | | | Merge pull request #4731 from jbradaric/vim-7.4.1054Justin M. Keyes2016-05-12
|\ \ \ \ \ \ | | | | | | | | | | | | | | vim-patch:7.4.1054
| * | | | | | vim-patch:7.4.1054Jurica Bradaric2016-05-10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Illegal memory access. Solution: Check for missing pattern. (Dominique Pelle) https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
* / / / / / 'termguicolors' #4690Shougo Matsushita2016-05-10
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: Only works at startup (i.e., in the user's init.vim/vimrc/--cmd), but it should probably work at any time. --- patch 7.4.1799 Problem: 'guicolors' is a confusing option name. Solution: Use 'termguicolors' instead. (Hirohito Higashi) https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 patch 7.4.1806 Problem: 'termguicolors' option missing from the options window. Solution: Add the entry. https://github.com/vim/vim/commit/8e3d1b6326c103cc92f8d07b1161ee5172acf201 patch 7.4.1808 Problem: Using wrong feature name to check for 'termguicolors'. Solution: Use the right feature name. (Ken Takata) https://github.com/vim/vim/commit/8a24b794b89916c8074892e7b25121a21f1fa9c9 patch 7.4.1809 Problem: Using wrong short option name for 'termguicolors'. Solution: Use the option name. https://github.com/vim/vim/commit/868cfc19bb079a16ca58884b551486566f35419b
* | | | | Merge pull request #4588 from KillTheMule/vim-patch-1285Justin M. Keyes2016-05-10
|\ \ \ \ \ | |_|_|_|/ |/| | | | vim-patch: 7.4.1285
| * | | | vim-patch:7.4.1285KillTheMule2016-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Cannot measure elapsed time. Solution: Add reltimefloat(). https://github.com/vim/vim/commit/79c2c881bb7ae1cbdeeff91d4875b4bf2e54df06 Applied manually. None of the ifdef's applies anymore, and proftime_T was changed into an uint64_T, so the function profile_float to convert proftime_T to float is not needed in nvim.
* | | | | vim-patch:7.4.1091 #4627Michael Ennen2016-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: When making a change while need_wait_return is set there is a two second delay. Solution: Do not assume the ATTENTION prompt was given when need_wait_return was set already. https://github.com/vim/vim/commit/b01f357791f88c7083e58cf2b36509dd83f21ea2
* | | | | Merge pull request #4720 from jbradaric/vim-7.4.1042Justin M. Keyes2016-05-10
|\ \ \ \ \ | | | | | | | | | | | | vim-patch:7.4.1042
| * | | | | vim-patch:7.4.1042Jurica Bradaric2016-05-08
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: g-CTRL-G shows the word count, but there is no way to get the word count in a script. Solution: Add the wordcount() function. (Christian Brabandt) https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
* | | | | Merge pull request #4695 from KillTheMule/vim-7.4.896Justin M. Keyes2016-05-10
|\ \ \ \ \ | | | | | | | | | | | | vim-patch:7.4.896
| * | | | | Linting.KillTheMule2016-05-08
| | | | | |
| * | | | | vim-patch:7.4.896Rui Abreu Ferreira2016-05-08
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Editing a URL, which netrw should handle, doesn't work. Solution: Avoid changing slashes to backslashes. (Yasuhiro Matsumoto) https://github.com/vim/vim/commit/b4f6a46b01ed00b642a2271e9d1559e51ab0f2c4 Cherry-picked from https://github.com/neovim/neovim/pull/810, rebased.
* | | | | Merge pull request #4717 from jamessan/vim-7.4.1015Justin M. Keyes2016-05-10
|\ \ \ \ \ | | | | | | | | | | | | vim-patch:7.4.1015
| * | | | | Linting all the daysJames McCoy2016-05-06
| | | | | |
| * | | | | vim-patch:7.4.1015James McCoy2016-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: The column is not restored properly when the matchparen plugin is used in Insert mode and the cursor is after the end of the line. Solution: Set the curswant flag. (Christian Brabandt). Also fix highlighting the match of the character before the cursor. https://github.com/vim/vim/commit/c21d67e33c1b42a492e04788cbb14a23a6724e39
* | | | | | version.c: update N/A. #4660Michael Ennen2016-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vim-patch:7.4.1562 is N/A because do_helptags(..) no longer has a dirname argument and dirname is explicitly allocated in the method body, so it must be freed. Helped-by: oni-link
* | | | | | Merge pull request #4639 from brcolow/vim-7.4.1347Justin M. Keyes2016-05-10
|\ \ \ \ \ \ | | | | | | | | | | | | | | vim-patch: 7.4.1347
| * | | | | | vim-patch: 7.4.1347Michael Ennen2016-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: When there is any error Vim will use a non-zero exit code. Solution: When using ":silent!" do not set the exit code. (Yasuhiro Matsumoto) https://github.com/vim/vim/commit/8b778d55993d951a65f8a59843cecd177c707676
* | | | | | | Merge pull request #4628 from brcolow/vim-7.4.1101Justin M. Keyes2016-05-10
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | vim-patch: 7.4.1101
| * | | | | | vim-patch: 7.4.1101Michael Ennen2016-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: With 'rightleft' and concealing the cursor may move to the wrong position. Solution: Compute the column differently when 'rightleft' is set. (Hirohito Higashi) https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
* | | | | | | getchar.c wconversion: Change typessach1t2016-05-07
| | | | | | |
* | | | | | | Enable -Wconversion for getchar.csach1t2016-05-07
| |_|/ / / / |/| | | | |
* | | | | | version.c: Mark 7.4.1010 as NAJames McCoy2016-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7.4.1010 relies on the “:smile” command that was added in 7.4.1005, which was also marked NA.
* | | | | | vim-patch:7.4.1007James McCoy2016-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: When a symbolic link points to a file in the root directory, the swapfile is not correct. Solution: Do not try getting the full name of a file in the root directory. (Milly, closes vim/vim#501) https://github.com/vim/vim/commit/e3303cb0817e826e3c25d5dc4ac10b569d0841e1 This was already fixed in Neovim by c708061.
* | | | | | Merge pull request #4350 from DarkDefender/term_colorJustin M. Keyes2016-05-06
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix guessing incorrect color index in terminal
| * | | | | | Fix guessing incorrect color index in terminalSebastian Parborg2016-03-01
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | This should fix issue #2323
* | | | | | Windows: Fix os_nodetype() default returnRui Abreu Ferreira2016-05-06
| | | | | |
* | | | | | 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.
* | | | | | version.c: Mark 7.4.1005 as NA, per discussion in #4191James McCoy2016-05-05
| | | | | |
* | | | | | 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
| * | | | | | | | 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
| * | | | | | | | 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 #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
* | | | | | | | | *: 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.
* | | | | | | | | Merge pull request #4681 from equalsraf/tb-msvc-varmacrosJustin M. Keyes2016-05-01
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | MSVC: Avoid variadic macro bug in STATIC_ASSERT