summaryrefslogtreecommitdiffstats
path: root/src/fileio.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-06-24 21:16:56 +0000
committerBram Moolenaar <Bram@vim.org>2008-06-24 21:16:56 +0000
commit3577c6fafb77da5419cd1001dac56f204d480bdc (patch)
tree46a08e8d03068c31624359c2601b3645c2881d8c /src/fileio.c
parenta7241f5f19fd0865ce697939c347a8c88fb507d5 (diff)
updated for version 7.2a
Diffstat (limited to 'src/fileio.c')
-rw-r--r--src/fileio.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/fileio.c b/src/fileio.c
index de123a09ce..b97e38f92f 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -21,10 +21,6 @@
#include "vim.h"
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-
#ifdef __TANDEM
# include <limits.h> /* for SSIZE_MAX */
#endif
@@ -4702,7 +4698,7 @@ nofail:
* front of the file name. */
if (errnum != NULL)
{
- mch_memmove(IObuff + numlen, IObuff, STRLEN(IObuff) + 1);
+ STRMOVE(IObuff + numlen, IObuff);
mch_memmove(IObuff, errnum, (size_t)numlen);
}
STRCAT(IObuff, errmsg);
@@ -5976,7 +5972,7 @@ buf_modname(shortname, fname, ext, prepend_dot)
#endif
)
{
- mch_memmove(e + 1, e, STRLEN(e) + 1);
+ STRMOVE(e + 1, e);
#ifdef RISCOS
*e = '/';
#else
@@ -6593,7 +6589,8 @@ buf_check_timestamp(buf, focus)
buf_reload(buf, orig_mode);
#ifdef FEAT_AUTOCMD
- if (buf_valid(buf))
+ /* Trigger FileChangedShell when the file was changed in any way. */
+ if (buf_valid(buf) && retval != 0)
(void)apply_autocmds(EVENT_FILECHANGEDSHELLPOST,
buf->b_fname, buf->b_fname, FALSE, buf);
#endif