diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2025-02-23 17:06:54 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2025-02-23 17:19:55 +0800 |
| commit | 0861ea6949a0c7281c56083092d389cae5d7bde8 (patch) | |
| tree | bfac3728c608de0279b9b0089a9637219c9e5fd8 /src | |
| parent | 16e6f6e5841dd582620307e110b3da851e0e0a95 (diff) | |
| download | rneovim-0861ea6949a0c7281c56083092d389cae5d7bde8.tar.gz rneovim-0861ea6949a0c7281c56083092d389cae5d7bde8.tar.bz2 rneovim-0861ea6949a0c7281c56083092d389cae5d7bde8.zip | |
vim-patch:9.1.1139: [fifo] is not displayed when editing a fifo
Problem: [fifo] is not displayed when editing a fifo
(after v7.4.2189)
Solution: stat the filename and detect the type correctly
fixes: vim/vim#16702
closes: vim/vim#16705
https://github.com/vim/vim/commit/f1c3134ee1f263e537212a3072e8aa4cb7e8d953
Co-authored-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/buffer.c | 2 | ||||
| -rw-r--r-- | src/nvim/fileio.c | 4 |
2 files changed, 5 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 |