diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-27 17:14:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-27 17:14:31 -0500 |
| commit | a58c5509d94f01f4a4edd6b4784f8d00b70af5b3 (patch) | |
| tree | b3cadc41e6fd4c747de5635dc0fb7556ec5e6e13 /src/nvim/fileio.c | |
| parent | f2be59d8f80f2a1a68d5976b9cec3fa55da3700e (diff) | |
| parent | cff4cad25a1236bd869843f9578b7f276518d9b8 (diff) | |
| download | rneovim-a58c5509d94f01f4a4edd6b4784f8d00b70af5b3.tar.gz rneovim-a58c5509d94f01f4a4edd6b4784f8d00b70af5b3.tar.bz2 rneovim-a58c5509d94f01f4a4edd6b4784f8d00b70af5b3.zip | |
Merge pull request #13607 from janlazo/vim-8.2.2221
vim-patch:8.1.2227,8.2.{315,928,1007,1052,1121,1580,2221,2229,2231,2232}
Diffstat (limited to 'src/nvim/fileio.c')
| -rw-r--r-- | src/nvim/fileio.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 936a9d1397..e1e34bf24a 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -2032,7 +2032,7 @@ static char_u *next_fenc(char_u **pp, bool *alloced) r = enc_canonize(*pp); *pp += STRLEN(*pp); } else { - r = vim_strnsave(*pp, (int)(p - *pp)); + r = vim_strnsave(*pp, p - *pp); *pp = p + 1; p = enc_canonize(r); xfree(r); @@ -4675,7 +4675,6 @@ check_timestamps( ) { int didit = 0; - int n; /* Don't check timestamps while system() or another low-level function may * cause us to lose and gain focus. */ @@ -4703,7 +4702,7 @@ check_timestamps( if (buf->b_nwindows > 0) { bufref_T bufref; set_bufref(&bufref, buf); - n = buf_check_timestamp(buf, focus); + const int n = buf_check_timestamp(buf); if (didit < n) { didit = n; } @@ -4773,11 +4772,7 @@ static int move_lines(buf_T *frombuf, buf_T *tobuf) * return 2 if a message has been displayed. * return 0 otherwise. */ -int -buf_check_timestamp( - buf_T *buf, - int focus /* called for GUI focus event */ -) +int buf_check_timestamp(buf_T *buf) FUNC_ATTR_NONNULL_ALL { int retval = 0; |