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 #9122 from janlazo/vim-8.1.0473

Browse Source
This commit is contained in:
Justin M. Keyes 2018-10-13 14:40:16 -07:00 committed by GitHub
commit aa87dd2b89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/memline.c
View File

@ -1449,7 +1449,7 @@ static char *make_percent_swname(const char *dir, char *name)
}
#ifdef UNIX
static int process_still_running;
static bool process_still_running;
#endif
/*
@ -1527,8 +1527,8 @@ static time_t swapfile_info(char_u *fname)
msg_outnum(char_to_long(b0.b0_pid));
#if defined(UNIX)
if (kill((pid_t)char_to_long(b0.b0_pid), 0) == 0) {
MSG_PUTS(_(" (still running)"));
process_still_running = TRUE;
MSG_PUTS(_(" (STILL RUNNING)"));
process_still_running = true;
}
#endif
}
@ -3150,7 +3150,9 @@ attention_message (
msg_outtrans(buf->b_fname);
MSG_PUTS("\"\n");
FileInfo file_info;
if (os_fileinfo((char *)buf->b_fname, &file_info)) {
if (!os_fileinfo((char *)buf->b_fname, &file_info)) {
MSG_PUTS(_(" CANNOT BE FOUND"));
} else {
MSG_PUTS(_(" dated: "));
x = file_info.stat.st_mtim.tv_sec;
p = ctime(&x); // includes '\n'
@ -3347,7 +3349,7 @@ static char *findswapname(buf_T *buf, char **dirp, char *old_fname,
int choice = 0;
#ifdef UNIX
process_still_running = FALSE;
process_still_running = false;
#endif
/*
* If there is a SwapExists autocommand and we can handle