diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-01 17:30:38 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-01 17:30:38 -0400 |
| commit | d542de4a76dd9e600ebcf1405efdc9d3090ad9a8 (patch) | |
| tree | 60b1d2aad6205c74b7c2611fbbed45759a302f4f /src/nvim/fileio.c | |
| parent | 91afb30b667bbc321d351708f694d00b256be585 (diff) | |
| parent | cf4e1fb0f4962319eee292248d9c1f73be3a8d0c (diff) | |
| download | rneovim-d542de4a76dd9e600ebcf1405efdc9d3090ad9a8.tar.gz rneovim-d542de4a76dd9e600ebcf1405efdc9d3090ad9a8.tar.bz2 rneovim-d542de4a76dd9e600ebcf1405efdc9d3090ad9a8.zip | |
Merge pull request #4688 from ZyX-I/clint-checks
Add check for boolean operators placement
Diffstat (limited to 'src/nvim/fileio.c')
| -rw-r--r-- | src/nvim/fileio.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index b9d9ea5457..6c0bc59d93 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -605,13 +605,14 @@ readfile ( * Don't do this for a "nofile" or "nowrite" buffer type. */ if (!bt_dontwrite(curbuf)) { check_need_swap(newfile); - if (!read_stdin && (curbuf != old_curbuf - || (using_b_ffname && (old_b_ffname != curbuf->b_ffname)) - || (using_b_fname && - (old_b_fname != curbuf->b_fname)))) { + if (!read_stdin + && (curbuf != old_curbuf + || (using_b_ffname && (old_b_ffname != curbuf->b_ffname)) + || (using_b_fname && (old_b_fname != curbuf->b_fname)))) { EMSG(_(e_auchangedbuf)); - if (!read_buffer) + if (!read_buffer) { close(fd); + } return FAIL; } #ifdef UNIX @@ -4369,8 +4370,8 @@ char *modname(const char *fname, const char *ext, bool prepend_dot) // (we need the full path in case :cd is used). if (fname == NULL || *fname == NUL) { retval = xmalloc(MAXPATHL + extlen + 3); // +3 for PATHSEP, "_" (Win), NUL - if (os_dirname((char_u *)retval, MAXPATHL) == FAIL || - (fnamelen = strlen(retval)) == 0) { + if (os_dirname((char_u *)retval, MAXPATHL) == FAIL + || (fnamelen = strlen(retval)) == 0) { xfree(retval); return NULL; } |