aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' of github.com:ckelsel/neovim into vim-8.0.0101ckelsel2017-10-09
|\
| * Merge remote-tracking branch 'upstream/master'ckelsel2017-10-09
| |\
| | * Merge #7082 'api: nvim_get_hl_by_name/by_id'Justin M. Keyes2017-10-08
| | |\
| | | * test: nvim_get_hl_by_name/by_id #7082Justin M. Keyes2017-10-08
| | | | | | | | | | | | | | | | | | | | - test all properties - test failure modes
| | | * Merge #7082 'api: nvim_get_hl_by_name/by_id'Justin M. Keyes2017-10-08
| | | |\
| | | | * Remove duplicate ATTRENTRY_INITMatthieu Coudron2017-09-30
| | | | |
| | | | * Changed prototypes to accept a boolean "rgb"Matthieu Coudron2017-09-30
| | | | |
| | | | * Increased test coverage for RGB and ctermMatthieu Coudron2017-09-30
| | | | |
| | | | * Adds nvim_get_hl_by_name/by_idMatthieu Coudron2017-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...in order to retrieve highlights. Added test/functional/api/highlight_spec.lua HL_NORMAL is not really a good name, since it's more like an empty attribute than the normal's one. If one pays attention, syn_cterm_attr2entry is never called with attr=0 because it's always special cased before. I suggest in subsequent PRs we remove the ATTR_OFF and just insert an EMPTY ATTR/RESET_ATTR/UNINITIALIZED for id 0.
| | * | | vim-patch:8.0.0164 (#7368)KunMing Xie2017-10-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Outdated and misplaced comments. Solution: Fix the comments. https://github.com/vim/vim/commit/caa55b65c204946d160c1b743c5f8f3b506dc4d3
| | * | | gitignore: cmake-build-debug (#7359)timothy eichler2017-10-08
| | |/ /
| * | | Merge remote-tracking branch 'upstream/master'ckelsel2017-10-08
| |\| |
| | * | Merge #7364 lower priority of 'cursorline', 'cursorcolumn'Justin M. Keyes2017-10-07
| | |\ \
| | | * | syntax: 'cursorline': low priority #6380Justin M. Keyes2017-10-07
| | | | |
| | | * | syntax: 'cursorcolumn', 'colorcolumn': low priority #6380Justin M. Keyes2017-10-07
| | | | |
| | * | | resettitle(): remove conditions (#7360)Justin M. Keyes2017-10-07
| | | | | | | | | | | | | | | | | | | | | | | | | These conditions were added in #7358 for no apparent reason. ref https://github.com/neovim/neovim/pull/7358#discussion_r143064448
| | * | | vim-patch:8.0.0142 (#7335)KunMing Xie2017-10-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see also #7082 Problem: Normal colors are wrong with 'termguicolors'. Solution: Initialize to INVALCOLOR instead of zero. (Ben Jackson, closes vim/vim#1344) https://github.com/vim/vim/commit/0cdb72aa38c4a0140c94d56bf8bc17cb30260ebf
| | * | | vim-patch:8.0.0148 #7344ckelsel2017-10-07
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: When a C preprocessor statement has two line continuations the following line does not have the right indent. (Ken Takata) Solution: Add the indent of the previous continuation line. (Hirohito Higashi) https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
| | * | vim-patch:8.0.0157 (#7362)KunMing Xie2017-10-07
| | | | | | | | | | | | | | | | | | | | | | | | Problem: No command line completion for ":syntax spell" and ":syntax sync". Solution: Implement the completion. (Dominique Pelle) https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
| | * | eval.c: ga_concat_esc() #7357Andrew Ferreira2017-10-07
| | | | | | | | | | | | | | | | vim-patch:2368917d8f0c0a997eac7a51ddfaa748dc528392 closes #7256
| * | | Merge remote-tracking branch 'upstream/master'ckelsel2017-10-07
| |\| |
| | * | Merge #7358 from justinmk/titleoldJustin M. Keyes2017-10-05
| | |\ \
| | | * | 'titleold': move logic to getout()Justin M. Keyes2017-10-05
| | | | |
| | | * | 'titleold': simplify behaviorJustin M. Keyes2017-10-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - default 'titleold' to empty - set title on exit if 'title' is enabled and 'titleold' is non-empty - update docs
| | | * | 'titleold': set UI title on exit #7191nate2017-10-05
| | |/ / | | | | | | | | | | | | | | | | closes #7129 ref #4063
| | * | editorconfig: handle Vim help files (#7354)Jan Edmund Lazo2017-10-04
| | | |
| | * | Merge pull request #7355 from jamessan/ngettext-fixJames McCoy2017-10-03
| | |\ \ | | | | | | | | | | Stub ngettext when libintl isn't available
| | | * | Stub ngettext when libintl isn't availableJames McCoy2017-10-03
| | |/ / | | | | | | | | | | | | | | | | | | | | This should have been included in #6547 as part of vim-patch:7.4.2152. Closes #7352
| | * | Merge #7349 'win: more path-handling fixes'Justin M. Keyes2017-10-02
| | |\ \
| | | * | test: avoid extra clear() callsJustin M. Keyes2017-10-02
| | | | | | | | | | | | | | | | | | | | also: various other cleanup
| | | * | test/shada: fixup for Windows backslashes #7287Ignas Anikevicius2017-10-02
| | | | |
| | | * | win: vim_FullName(): force backslashes #7287Ignas Anikevicius2017-10-02
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace obvious cases of '/' literal with PATHSEP. (There are still some remaining cases that need closer inspection.) - Fixup tests: ui/screen_basic closes #7117 ref https://github.com/neovim/neovim/issues/2471#issuecomment-271193714
| | * | ci/appveyor: modify compression options for cacheJustin M. Keyes2017-10-01
| | | | | | | | | | | | | | | | Attempt to workaround #7317 by using a different compression algorithm.
| * | | Merge remote-tracking branch 'upstream/master'ckelsel2017-09-30
| |\| |
| | * | runtime/syntax/vim.vim: highlight nvim groups #7338E Kawashima2017-09-30
| | |/ | | | | | | | | | regressed by 86b596dc7a49f1b148ef82a356b972b93ed0f6d4
| | * Merge #7328 from jamessan/keep-testdir-makeJustin M. Keyes2017-09-28
| | |\ | | | | | | | | Fix overzealous exclusions in vim-patch.sh
| | | * oldtest: Run test_mksession_utf8 testsJames McCoy2017-09-27
| | | |
| | | * vim-patch.sh: Exclude testdir/ files from src/ file pruningJames McCoy2017-09-27
| | |/ | | | | | | | | | | | | | | | Without the testdir/ exclusion, all directories under src/ were affected by this cleanup. However, testdir/ has its own pruning that happens later.
| * | Merge remote-tracking branch 'upstream/master'ckelsel2017-09-27
| |\|
| * | Merge remote-tracking branch 'upstream/master'ckelsel2017-09-24
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master'ckelsel2017-09-17
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master'ckelsel2017-09-13
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master'ckelsel2017-09-11
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master'ckelsel2017-09-10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'ckelsel2017-09-01
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'ckelsel2017-08-30
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'ckelsel2017-08-21
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'ckelsel2017-08-17
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into HEADckelsel2017-08-14
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | io: more guards against NULL filename (#7159)Justin M. Keyes2017-08-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | References ac055d677aa9 References #4370