mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
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: #16702 closes: #16705 Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
@@ -275,6 +275,8 @@ open_buffer(
|
|||||||
{
|
{
|
||||||
curbuf->b_p_bin = save_bin;
|
curbuf->b_p_bin = save_bin;
|
||||||
if (retval == OK)
|
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);
|
retval = read_buffer(FALSE, eap, flags);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@@ -366,15 +366,18 @@ readfile(
|
|||||||
goto theend;
|
goto theend;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!read_stdin && !read_buffer && !read_fifo)
|
|
||||||
{
|
|
||||||
#if defined(UNIX) || defined(VMS)
|
#if defined(UNIX) || defined(VMS)
|
||||||
|
if (!read_stdin && fname != NULL)
|
||||||
/*
|
/*
|
||||||
* On Unix it is possible to read a directory, so we have to
|
* On Unix it is possible to read a directory, so we have to
|
||||||
* check for it before the mch_open().
|
* check for it before the mch_open().
|
||||||
*/
|
*/
|
||||||
perm = mch_getperm(fname);
|
perm = mch_getperm(fname);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (!read_stdin && !read_buffer && !read_fifo)
|
||||||
|
{
|
||||||
|
#if defined(UNIX) || defined(VMS)
|
||||||
if (perm >= 0 && !S_ISREG(perm) // not a regular file ...
|
if (perm >= 0 && !S_ISREG(perm) // not a regular file ...
|
||||||
&& !S_ISFIFO(perm) // ... or fifo
|
&& !S_ISFIFO(perm) // ... or fifo
|
||||||
&& !S_ISSOCK(perm) // ... or socket
|
&& !S_ISSOCK(perm) // ... or socket
|
||||||
|
@@ -60,6 +60,33 @@ func Test_read_fifo_utf8()
|
|||||||
call delete('Xtestout')
|
call delete('Xtestout')
|
||||||
endfunc
|
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)')
|
||||||
|
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()
|
func Test_detect_ambiwidth()
|
||||||
CheckRunVimInTerminal
|
CheckRunVimInTerminal
|
||||||
|
|
||||||
|
@@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1139,
|
||||||
/**/
|
/**/
|
||||||
1138,
|
1138,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user