mirror of
https://github.com/vim/vim.git
synced 2025-09-10 22:33:40 -04:00
updated for version 7.0082
This commit is contained in:
parent
b765d63491
commit
631d6f6847
29
src/fileio.c
29
src/fileio.c
@ -6156,11 +6156,31 @@ buf_check_timestamp(buf, focus)
|
||||
}
|
||||
|
||||
if (reload)
|
||||
/* Reload the buffer. */
|
||||
buf_reload(buf);
|
||||
|
||||
#ifdef FEAT_GUI
|
||||
/* restore this in case an autocommand has set it; it would break
|
||||
* 'mousefocus' */
|
||||
need_mouse_correct = save_mouse_correct;
|
||||
#endif
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
/*
|
||||
* Reload a buffer that is already loaded.
|
||||
* Used when the file was changed outside of Vim.
|
||||
*/
|
||||
void
|
||||
buf_reload(buf)
|
||||
buf_T *buf;
|
||||
{
|
||||
exarg_T ea;
|
||||
pos_T old_cursor;
|
||||
linenr_T old_topline;
|
||||
int old_ro = buf->b_p_ro;
|
||||
int orig_mode = buf->b_orig_mode;
|
||||
buf_T *savebuf;
|
||||
int saved = OK;
|
||||
#ifdef FEAT_AUTOCMD
|
||||
@ -6297,15 +6317,6 @@ buf_check_timestamp(buf, focus)
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef FEAT_GUI
|
||||
/* restore this in case an autocommand has set it; it would break
|
||||
* 'mousefocus' */
|
||||
need_mouse_correct = save_mouse_correct;
|
||||
#endif
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
void
|
||||
buf_store_time(buf, st, fname)
|
||||
|
Loading…
x
Reference in New Issue
Block a user