aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* eval: Stop executing *eval() function at errorZyX2016-05-27
* Merge pull request #4821 from jamessan/vim-7.4.1096Justin M. Keyes2016-05-27
|\
| * vim-patch:7.4.1567James McCoy2016-05-25
| * vim-patch:7.4.1096James McCoy2016-05-25
* | Merge pull request #4819 from jamessan/vim-acb4f22Justin M. Keyes2016-05-25
|\ \ | |/ |/|
| * vim-patch:acb4f22James McCoy2016-05-25
|/
* Merge pull request #4815 from bfredl/timerfixBjörn Linse2016-05-25
|\
| * timers: racy situation found on travisBjörn Linse2016-05-25
|/
* Merge pull request #4624 from bfredl/timersBjörn Linse2016-05-25
|\
| * cmdline: Redraw the cmdline after processing eventsBjörn Linse2016-05-24
| * eval: implement timers. vim-patch: 7.4.1578, 7.4.1831Björn Linse2016-05-24
* | Merge pull request #4741 from brcolow/vim-7.4.1281Justin M. Keyes2016-05-25
|\ \
| * | vim-patch:7.4.1281Michael Ennen2016-05-25
* | | Merge pull request #4807 from jamessan/vim-7.4.1053Justin M. Keyes2016-05-25
|\ \ \
| * | | vim-patch:7.4.1071James McCoy2016-05-24
| * | | vim-patch:7.4.1053James McCoy2016-05-24
| | |/ | |/|
* | | Merge pull request #4812 from jamessan/vim-a61018dJustin M. Keyes2016-05-24
|\ \ \ | |/ / |/| |
| * | vim-patch:7.4.1064James McCoy2016-05-24
| * | vim-patch:4d1c0a4James McCoy2016-05-24
| * | vim-patch:a61018dJames McCoy2016-05-24
|/ /
* | Merge pull request #4808 from justinmk/small.vimJustin M. Keyes2016-05-22
|\ \
| * | test: Remove references to tiny.vim/small.vim/mbyte.vimMichael Ennen2016-05-22
|/ /
* | Merge pull request #2824 from lucc/legacy/close_countJustin M. Keyes2016-05-22
|\ \
| * | tests: Modernize legacy/close_count.Lucas Hoffmann2016-05-20
| * | tests: Migrate legacy test close_count.Lucas Hoffmann2016-05-20
* | | Merge pull request #4806 from justinmk/nodetypeJustin M. Keyes2016-05-22
|\ \ \
| * | | os_nodetype: Return NODE_NORMAL if os_stat fails.Justin M. Keyes2016-05-22
|/ / /
* | | Merge pull request #4786 from jbradaric/vim-7.4.1516Justin M. Keyes2016-05-22
|\ \ \
| * | | file_perm_spec: Fix the test condition on Windows.Jurica Bradaric2016-05-20
| * | | vim-patch:7.4.1521Jurica Bradaric2016-05-19
| * | | vim-patch:7.4.1516Jurica Bradaric2016-05-19
* | | | Merge pull request #4787 from brcolow/vim-7.4.1050Justin M. Keyes2016-05-22
|\ \ \ \
| * | | | Fixes suggested by @justinmk and @jbradaricMichael Ennen2016-05-20
| * | | | vim-patch:7.4.1050Michael Ennen2016-05-19
* | | | | Merge pull request #4793 from brcolow/vim-7.4.1061Justin M. Keyes2016-05-22
|\ \ \ \ \
| * | | | | vim-patch:7.4.1061Michael Ennen2016-05-19
* | | | | | host.vim: s:RegistrationCommands(): Normalize slashes.Justin M. Keyes2016-05-22
* | | | | | Merge #4800 'syntax: foo=NONE should clear hi group'Justin M. Keyes2016-05-21
|\ \ \ \ \ \
| * | | | | | test/syntax: foo=NONE clears hi groupAdnoC2016-05-21
| * | | | | | syntax: foo=NONE clears hi groupAdnoC2016-05-21
|/ / / / / /
* | | | | | Merge pull request #4737 from jamessan/vim-7.4.1017Justin M. Keyes2016-05-21
|\ \ \ \ \ \
| * | | | | | vim-patch:7.4.1034James McCoy2016-05-20
| * | | | | | vim-patch:7.4.1018James McCoy2016-05-20
| * | | | | | vim-patch:7.4.1017James McCoy2016-05-20
|/ / / / / /
* | | | | | Merge pull request #4779 from equalsraf/tb-lua-without-unittestJustin M. Keyes2016-05-20
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | cmake: Allow building without LuajitRui Abreu Ferreira2016-05-19
* | | | | | Merge #4744 'highlight listchar in cursorline'Justin M. Keyes2016-05-20
|\ \ \ \ \ \
| * | | | | | test: listcharsYichao Zhou2016-05-20
| * | | | | | screen.c: Fix listchars hl for space/nbsp in visual mode.Yichao Zhou2016-05-20
| * | | | | | test: cursorline, listcharsYichao Zhou2016-05-20