IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8642 from janlazo/vim-8.0.0704

Browse Source
This commit is contained in:
Justin M. Keyes 2018-06-26 08:14:09 +02:00 committed by GitHub
commit cafb92487b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/ex_cmds.c
View File

@ -2352,8 +2352,8 @@ int do_ecmd(
} else { } else {
// <VN> We could instead free the synblock // <VN> We could instead free the synblock
// and re-attach to buffer, perhaps. // and re-attach to buffer, perhaps.
if (curwin->w_buffer != NULL if (curwin->w_buffer == NULL
&& curwin->w_s == &(curwin->w_buffer->b_s)) { || curwin->w_s == &(curwin->w_buffer->b_s)) {
curwin->w_s = &(buf->b_s); curwin->w_s = &(buf->b_s);
} }

2
src/nvim/ex_cmds.lua
View File

@ -3076,7 +3076,7 @@ return {
}, },
{ {
command='wincmd', command='wincmd',
flags=bit.bor(NEEDARG, WORD1, RANGE, NOTADR), flags=bit.bor(NEEDARG, WORD1, RANGE, NOTADR, CMDWIN),
addr_type=ADDR_WINDOWS, addr_type=ADDR_WINDOWS,
func='ex_wincmd', func='ex_wincmd',
}, },

8
src/nvim/ex_getln.c
View File

@ -6183,9 +6183,13 @@ static int open_cmdwin(void)
ccline.cmdbuff = NULL; ccline.cmdbuff = NULL;
} else } else
ccline.cmdbuff = vim_strsave(get_cursor_line_ptr()); ccline.cmdbuff = vim_strsave(get_cursor_line_ptr());
if (ccline.cmdbuff == NULL) if (ccline.cmdbuff == NULL) {
ccline.cmdbuff = vim_strsave((char_u *)"");
ccline.cmdlen = 0;
ccline.cmdbufflen = 1;
ccline.cmdpos = 0;
cmdwin_result = Ctrl_C; cmdwin_result = Ctrl_C;
else { } else {
ccline.cmdlen = (int)STRLEN(ccline.cmdbuff); ccline.cmdlen = (int)STRLEN(ccline.cmdbuff);
ccline.cmdbufflen = ccline.cmdlen + 1; ccline.cmdbufflen = ccline.cmdlen + 1;
ccline.cmdpos = curwin->w_cursor.col; ccline.cmdpos = curwin->w_cursor.col;

4
src/nvim/option.c
View File

@ -3243,6 +3243,10 @@ did_set_string_option (
did_filetype = true; did_filetype = true;
apply_autocmds(EVENT_FILETYPE, curbuf->b_p_ft, apply_autocmds(EVENT_FILETYPE, curbuf->b_p_ft,
curbuf->b_fname, true, curbuf); curbuf->b_fname, true, curbuf);
// Just in case the old "curbuf" is now invalid
if (varp != &(curbuf->b_p_ft)) {
varp = NULL;
}
} }
} }
if (varp == &(curwin->w_s->b_p_spl)) { if (varp == &(curwin->w_s->b_p_spl)) {