diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/buffer.c | 2 | ||||
| -rw-r--r-- | src/nvim/fileio.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 9e6877cbfa..5fec2f1211 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -305,6 +305,8 @@ int open_buffer(bool read_stdin, exarg_T *eap, int flags_arg) if (read_fifo) { curbuf->b_p_bin = save_bin; if (retval == OK) { + // don't add READ_FIFO here, otherwise we won't be able to + // detect the encoding retval = read_buffer(false, eap, flags); } } diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 61b252f823..b79ecf22d7 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -353,10 +353,9 @@ int readfile(char *fname, char *sfname, linenr_T from, linenr_T lines_to_skip, } } - if (!read_buffer && !read_stdin && !read_fifo) { + if (!read_stdin && fname != NULL) { perm = os_getperm(fname); - // On Unix it is possible to read a directory, so we have to - // check for it before os_open(). + } #ifdef OPEN_CHR_FILES # define IS_CHR_DEV(perm, fname) S_ISCHR(perm) && is_dev_fd_file(fname) @@ -364,12 +363,15 @@ int readfile(char *fname, char *sfname, linenr_T from, linenr_T lines_to_skip, # define IS_CHR_DEV(perm, fname) false #endif + if (!read_stdin && !read_buffer && !read_fifo) { if (perm >= 0 && !S_ISREG(perm) // not a regular file ... && !S_ISFIFO(perm) // ... or fifo && !S_ISSOCK(perm) // ... or socket && !(IS_CHR_DEV(perm, fname)) // ... or a character special file named /dev/fd/<n> ) { + // On Unix it is possible to read a directory, so we have to + // check for it before os_open(). if (S_ISDIR(perm)) { if (!silent) { filemess(curbuf, fname, _(msg_is_a_directory)); |