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 #9994 from janlazo/vim-8.1.1306

Browse Source 
vim-patch:8.1.{1306,1312}
This commit is contained in:
Justin M. Keyes 2019-05-11 12:48:26 +02:00 committed by GitHub
commit da3c0e4962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/doc/debug.txt
View File

@ -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. 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 For other compilers, you should always use the corresponding debugger: gdb
a Vim executable compiled with the Borland compiler; gdb (see above (see above |debug-gcc|) for the Cygwin and MinGW compilers.
|debug-gcc|) for the Cygwin and MinGW compilers.
*debug-vs2005* *debug-vs2005*

11
src/nvim/ex_cmds2.c
View File

@ -1298,7 +1298,12 @@ void dialog_changed(buf_T *buf, bool checkall)
{ {
char_u buff[DIALOG_MSG_SIZE]; char_u buff[DIALOG_MSG_SIZE];
int ret; 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); dialog_msg(buff, _("Save changes to \"%s\"?"), buf->b_fname);
if (checkall) { if (checkall) {
@ -1307,10 +1312,6 @@ void dialog_changed(buf_T *buf, bool checkall)
ret = vim_dialog_yesnocancel(VIM_QUESTION, NULL, buff, 1); 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 (ret == VIM_YES) {
if (buf->b_fname != NULL if (buf->b_fname != NULL
&& check_overwrite(&ea, && check_overwrite(&ea,

8
src/nvim/quickfix.c
View File

@ -4260,10 +4260,10 @@ static void restore_start_dir(char_u *dirname_start)
if (STRCMP(dirname_start, dirname_now) != 0) { if (STRCMP(dirname_start, dirname_now) != 0) {
/* If the directory has changed, change it back by building up an /* If the directory has changed, change it back by building up an
* appropriate ex command and executing it. */ * appropriate ex command and executing it. */
exarg_T ea; exarg_T ea = {
.arg = dirname_start,
ea.arg = dirname_start; .cmdidx = (curwin->w_localdir == NULL) ? CMD_cd : CMD_lcd,
ea.cmdidx = (curwin->w_localdir == NULL) ? CMD_cd : CMD_lcd; };
ex_cd(&ea); ex_cd(&ea);
} }
xfree(dirname_now); xfree(dirname_now);