diff options
| -rw-r--r-- | src/nvim/buffer.c | 2 | ||||
| -rw-r--r-- | src/nvim/fileio.c | 4 | ||||
| -rw-r--r-- | test/old/testdir/test_startup_utf8.vim | 28 |
3 files changed, 33 insertions, 1 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..7c41c84838 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -353,10 +353,11 @@ 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,6 +365,7 @@ 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 diff --git a/test/old/testdir/test_startup_utf8.vim b/test/old/testdir/test_startup_utf8.vim index e8b99e7937..96b593f1bd 100644 --- a/test/old/testdir/test_startup_utf8.vim +++ b/test/old/testdir/test_startup_utf8.vim @@ -60,6 +60,34 @@ func Test_read_fifo_utf8() call delete('Xtestout') endfunc +func Test_detect_fifo() + CheckUnix + " Using bash/zsh's process substitution. + if executable('bash') + set shell=bash + elseif executable('zsh') + set shell=zsh + else + throw 'Skipped: bash or zsh is required' + endif + let linesin = ['one', 'two'] + call writefile(linesin, 'Xtestin_fifo', 'D') + let after = [ + \ 'call writefile(split(execute(":mess"), "\\n"), "Xtestout")', + \ 'quit!', + \ ] + " if RunVim([], after, '<(cat Xtestin_fifo)') + if RunVim(['set shortmess-=F'], after, '<(cat Xtestin_fifo)') + let lines = readfile('Xtestout') + call assert_match('\[fifo\]', lines[0]) + " call assert_match('\[fifo\]', lines[1]) + else + call assert_equal('', 'RunVim failed.') + endif + + call delete('Xtestout') +endfunc + func Test_detect_ambiwidth() CheckRunVimInTerminal |