Commit Graph

9575 Commits

Author SHA1 Message Date
ckelsel
d2b0c5838a Merge branch 'master' of github.com:ckelsel/neovim into vim-8.0.0101 2017-10-10 14:50:13 +08:00
Justin M. Keyes
77f1392f07 Merge #7327 from ckelsel/vim-8.0.0131 2017-10-09 22:56:30 +02:00
ckelsel
2abd939dae Merge branch 'master' of github.com:ckelsel/neovim into vim-8.0.0101 2017-10-09 21:17:15 +08:00
ckelsel
ceb40c0411 Merge remote-tracking branch 'upstream/master' 2017-10-09 21:16:43 +08:00
Justin M. Keyes
db999821d4 Merge #7082 'api: nvim_get_hl_by_name/by_id' 2017-10-08 21:19:02 +02:00
Justin M. Keyes
52517321d1 test: nvim_get_hl_by_name/by_id #7082
- test all properties
- test failure modes
2017-10-08 21:17:20 +02:00
Justin M. Keyes
04187a1c74 Merge #7082 'api: nvim_get_hl_by_name/by_id' 2017-10-08 19:09:14 +02:00
KunMing Xie
1663599beb vim-patch:8.0.0164 (#7368)
Problem:    Outdated and misplaced comments.
Solution:   Fix the comments.

caa55b65c2
2017-10-08 18:52:57 +02:00
timothy eichler
e565fc2294 gitignore: cmake-build-debug (#7359) 2017-10-08 18:26:44 +02:00
ckelsel
76606b6bc5 Merge remote-tracking branch 'upstream/master' 2017-10-08 09:35:23 +08:00
KunMing Xie
4b2592d7b6 Merge branch 'master' into vim-8.0.0131 2017-10-08 09:33:20 +08:00
Justin M. Keyes
032b088c84 Merge #7364 lower priority of 'cursorline', 'cursorcolumn' 2017-10-07 19:11:05 +02:00
Justin M. Keyes
d916ea107a resettitle(): remove conditions (#7360)
These conditions were added in #7358 for no apparent reason.

ref https://github.com/neovim/neovim/pull/7358#discussion_r143064448
2017-10-07 18:05:02 +02:00
KunMing Xie
e3ca1e6046 vim-patch:8.0.0142 (#7335)
see also #7082

Problem:    Normal colors are wrong with 'termguicolors'.
Solution:   Initialize to INVALCOLOR instead of zero. (Ben Jackson, closes vim/vim#1344)

0cdb72aa38
2017-10-07 17:20:34 +02:00
ckelsel
c0e45d97b0 vim-patch:8.0.0148 #7344
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)

c6aa475a27
2017-10-07 17:10:37 +02:00
Justin M. Keyes
d1874ab282 syntax: 'cursorline': low priority #6380 2017-10-07 16:45:15 +02:00
Justin M. Keyes
7a832c312f syntax: 'cursorcolumn', 'colorcolumn': low priority #6380 2017-10-07 16:31:34 +02:00
KunMing Xie
9ad7529f70 vim-patch:8.0.0157 (#7362)
Problem:    No command line completion for ":syntax spell" and ":syntax sync".
Solution:   Implement the completion. (Dominique Pelle)

2d02839050
2017-10-07 14:32:37 +02:00
Andrew Ferreira
a4019bc9f6 eval.c: ga_concat_esc() #7357
vim-patch:2368917d8f0c0a997eac7a51ddfaa748dc528392
closes #7256
2017-10-07 12:45:23 +02:00
ckelsel
f2b9ccec10 Merge remote-tracking branch 'upstream/master' 2017-10-07 18:14:09 +08:00
Justin M. Keyes
01487d4385 Merge #7358 from justinmk/titleold 2017-10-05 21:49:06 +02:00
Justin M. Keyes
73b50de925 'titleold': move logic to getout() 2017-10-05 09:49:17 +02:00
Justin M. Keyes
70e84a7c4c 'titleold': simplify behavior
- default 'titleold' to empty
- set title on exit if 'title' is enabled and 'titleold' is non-empty
- update docs
2017-10-05 09:18:33 +02:00
nate
5f4d2edeee 'titleold': set UI title on exit #7191
closes #7129
ref #4063
2017-10-05 09:18:30 +02:00
Jan Edmund Lazo
b7fe15d8f9 editorconfig: handle Vim help files (#7354) 2017-10-04 09:18:03 +02:00
James McCoy
07a0685b48 Merge pull request #7355 from jamessan/ngettext-fix
Stub ngettext when libintl isn't available
2017-10-03 17:29:27 -04:00
James McCoy
235fda5f86 Stub ngettext when libintl isn't available
This should have been included in #6547 as part of vim-patch:7.4.2152.

Closes #7352
2017-10-03 14:54:50 -04:00
KillTheMule
1f6138702c More tests 2017-10-02 21:49:53 +02:00
KillTheMule
41f624a85b Deal with NOP, add actext to output 2017-10-02 21:49:50 +02:00
Justin M. Keyes
01e53a5cbe Merge #7349 'win: more path-handling fixes' 2017-10-02 02:42:33 +02:00
Justin M. Keyes
6f7754dfa0 test: avoid extra clear() calls
also: various other cleanup
2017-10-02 01:46:16 +02:00
Ignas Anikevicius
e9dba214ea test/shada: fixup for Windows backslashes #7287 2017-10-02 00:48:43 +02:00
Ignas Anikevicius
2b133101cf win: vim_FullName(): force backslashes #7287
- 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
2017-10-02 00:48:30 +02:00
Justin M. Keyes
981387b7c8 ci/appveyor: modify compression options for cache
Attempt to workaround #7317 by using a different compression algorithm.
2017-10-01 12:17:26 +02:00
KillTheMule
9fb8b47ad8 menu_get: adjust tests for prettyprinting
... and add a bit of new testing
2017-10-01 11:47:35 +02:00
KillTheMule
4543fc1612 menu_get: prettyprint special chars 2017-10-01 11:47:31 +02:00
ckelsel
fae55937ac Merge remote-tracking branch 'upstream/master' 2017-09-30 21:38:29 +08:00
E Kawashima
95458609ab runtime/syntax/vim.vim: highlight nvim groups #7338
regressed by 86b596dc7a
2017-09-30 15:03:06 +02:00
Matthieu Coudron
481e40cc8c Remove duplicate ATTRENTRY_INIT 2017-09-30 11:44:50 +09:00
Matthieu Coudron
3a00648639 Changed prototypes to accept a boolean "rgb" 2017-09-30 11:43:26 +09:00
Matthieu Coudron
e3a2cca387 Increased test coverage for RGB and cterm 2017-09-30 11:43:26 +09:00
Matthieu Coudron
ba7277cfb4 Adds nvim_get_hl_by_name/by_id
...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.
2017-09-30 11:43:26 +09:00
Justin M. Keyes
c580ef68e8 Merge #7328 from jamessan/keep-testdir-make
Fix overzealous exclusions in vim-patch.sh
2017-09-28 08:16:55 +02:00
ckelsel
f97ca6b333 vim-patch:8.0.0155
Problem:    When sorting zero elements a NULL pointer is passed to qsort(),
            which ubsan warns for.
Solution:   Don't call qsort() if there are no elements. (Dominique Pelle)

a216255a4f
2017-09-28 12:28:25 +08:00
James McCoy
f1242c2a26
oldtest: Run test_mksession_utf8 tests 2017-09-27 08:27:31 -04:00
James McCoy
e6d4b7686c
vim-patch.sh: Exclude testdir/ files from src/ file pruning
Without the testdir/ exclusion, all directories under src/ were affected
by this cleanup.  However, testdir/ has its own pruning that happens
later.
2017-09-27 08:20:43 -04:00
ckelsel
65c97961ec vim-patch:8.0.0132
Problem:    Test fails because of using :finish.
Solution:   Change to return.

4c8980b717
2017-09-27 20:07:09 +08:00
ckelsel
36f13ceb0a vim-patch:8.0.0131
Problem:    Not enough test coverage for syntax commands.
Solution:   Add more tests. (Dominique Pelle)

73b484c4da
2017-09-27 20:05:39 +08:00
ckelsel
c3de878ab1 Merge remote-tracking branch 'upstream/master' 2017-09-27 19:34:19 +08:00
ckelsel
5d369ad384 Merge branch 'vim-8.0.0101' of github.com:ckelsel/neovim into vim-8.0.0101 2017-09-27 19:32:02 +08:00