diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2019-05-11 12:48:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-11 12:48:26 +0200 |
commit | da3c0e4962899645c8cfa06ee21429b4410a63ca (patch) | |
tree | ca8365cf34b5c166b221cffe02c36a6895ddae12 | |
parent | a541c681f6a2abc1c8e094000321d9fec752a6fd (diff) | |
parent | c82c5d757092e153c3c39a6fca2ad525208d1504 (diff) | |
download | rneovim-da3c0e4962899645c8cfa06ee21429b4410a63ca.tar.gz rneovim-da3c0e4962899645c8cfa06ee21429b4410a63ca.tar.bz2 rneovim-da3c0e4962899645c8cfa06ee21429b4410a63ca.zip |
Merge #9994 from janlazo/vim-8.1.1306
vim-patch:8.1.{1306,1312}
-rw-r--r-- | runtime/doc/debug.txt | 5 | ||||
-rw-r--r-- | src/nvim/ex_cmds2.c | 11 | ||||
-rw-r--r-- | src/nvim/quickfix.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt index fab12e36fa..7b08e61655 100644 --- a/runtime/doc/debug.txt +++ b/runtime/doc/debug.txt @@ -78,9 +78,8 @@ then the PDB was built with the EXE. If you have Visual Studio, use that instead of the VC Toolkit and WinDbg. -For other compilers, you should always use the corresponding debugger: TD for -a Vim executable compiled with the Borland compiler; gdb (see above -|debug-gcc|) for the Cygwin and MinGW compilers. +For other compilers, you should always use the corresponding debugger: gdb +(see above |debug-gcc|) for the Cygwin and MinGW compilers. *debug-vs2005* diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 53a5018fe0..40ff29d4a8 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -1298,7 +1298,12 @@ void dialog_changed(buf_T *buf, bool checkall) { char_u buff[DIALOG_MSG_SIZE]; int ret; - exarg_T ea; + // Init ea pseudo-structure, this is needed for the check_overwrite() + // function. + exarg_T ea = { + .append = false, + .forceit = false, + }; dialog_msg(buff, _("Save changes to \"%s\"?"), buf->b_fname); if (checkall) { @@ -1307,10 +1312,6 @@ void dialog_changed(buf_T *buf, bool checkall) ret = vim_dialog_yesnocancel(VIM_QUESTION, NULL, buff, 1); } - // Init ea pseudo-structure, this is needed for the check_overwrite() - // function. - ea.append = ea.forceit = false; - if (ret == VIM_YES) { if (buf->b_fname != NULL && check_overwrite(&ea, diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 786e40254d..29b3d19f52 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -4260,10 +4260,10 @@ static void restore_start_dir(char_u *dirname_start) if (STRCMP(dirname_start, dirname_now) != 0) { /* If the directory has changed, change it back by building up an * appropriate ex command and executing it. */ - exarg_T ea; - - ea.arg = dirname_start; - ea.cmdidx = (curwin->w_localdir == NULL) ? CMD_cd : CMD_lcd; + exarg_T ea = { + .arg = dirname_start, + .cmdidx = (curwin->w_localdir == NULL) ? CMD_cd : CMD_lcd, + }; ex_cd(&ea); } xfree(dirname_now); |