mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
updated for version 7.4.090
Problem: Win32: When a directory name contains an exclamation mark, completion doesn't complete the contents of the directory. Solution: Escape the exclamation mark. (Jan Stocker)
This commit is contained in:
parent
0671de335f
commit
8f5610df73
@ -3852,9 +3852,9 @@ vim_strsave_fnameescape(fname, shell)
|
|||||||
char_u buf[20];
|
char_u buf[20];
|
||||||
int j = 0;
|
int j = 0;
|
||||||
|
|
||||||
/* Don't escape '[' and '{' if they are in 'isfname'. */
|
/* Don't escape '[', '{' and '!' if they are in 'isfname'. */
|
||||||
for (p = PATH_ESC_CHARS; *p != NUL; ++p)
|
for (p = PATH_ESC_CHARS; *p != NUL; ++p)
|
||||||
if ((*p != '[' && *p != '{') || !vim_isfilec(*p))
|
if ((*p != '[' && *p != '{' && *p != '!') || !vim_isfilec(*p))
|
||||||
buf[j++] = *p;
|
buf[j++] = *p;
|
||||||
buf[j] = NUL;
|
buf[j] = NUL;
|
||||||
p = vim_strsave_escaped(fname, buf);
|
p = vim_strsave_escaped(fname, buf);
|
||||||
|
@ -34,7 +34,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
|
|||||||
test81.out test82.out test83.out test84.out test88.out \
|
test81.out test82.out test83.out test84.out test88.out \
|
||||||
test89.out test90.out test91.out test92.out test93.out \
|
test89.out test90.out test91.out test92.out test93.out \
|
||||||
test94.out test95.out test96.out test97.out test98.out \
|
test94.out test95.out test96.out test97.out test98.out \
|
||||||
test99.out test100.out test101.out
|
test99.out test100.out test101.out test102.out
|
||||||
|
|
||||||
.SUFFIXES: .in .out
|
.SUFFIXES: .in .out
|
||||||
|
|
||||||
@ -152,3 +152,4 @@ test98.out: test98.in
|
|||||||
test99.out: test99.in
|
test99.out: test99.in
|
||||||
test100.out: test100.in
|
test100.out: test100.in
|
||||||
test101.out: test101.in
|
test101.out: test101.in
|
||||||
|
test102.out: test102.in
|
||||||
|
@ -33,7 +33,7 @@ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
|
|||||||
test84.out test85.out test86.out test87.out test88.out \
|
test84.out test85.out test86.out test87.out test88.out \
|
||||||
test89.out test90.out test91.out test92.out test93.out \
|
test89.out test90.out test91.out test92.out test93.out \
|
||||||
test94.out test95.out test96.out test98.out test99.out \
|
test94.out test95.out test96.out test98.out test99.out \
|
||||||
test100.out test101.out
|
test100.out test101.out test102.out
|
||||||
|
|
||||||
SCRIPTS32 = test50.out test70.out
|
SCRIPTS32 = test50.out test70.out
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
|
|||||||
test84.out test85.out test86.out test87.out test88.out \
|
test84.out test85.out test86.out test87.out test88.out \
|
||||||
test89.out test90.out test91.out test92.out test93.out \
|
test89.out test90.out test91.out test92.out test93.out \
|
||||||
test94.out test95.out test96.out test98.out test99.out \
|
test94.out test95.out test96.out test98.out test99.out \
|
||||||
test100out test101.out
|
test100out test101.out test102.out
|
||||||
|
|
||||||
SCRIPTS32 = test50.out test70.out
|
SCRIPTS32 = test50.out test70.out
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
|
|||||||
test81.out test82.out test83.out test84.out test88.out \
|
test81.out test82.out test83.out test84.out test88.out \
|
||||||
test89.out test90.out test91.out test92.out test93.out \
|
test89.out test90.out test91.out test92.out test93.out \
|
||||||
test94.out test95.out test96.out test98.out test99.out \
|
test94.out test95.out test96.out test98.out test99.out \
|
||||||
test100.out test101.out
|
test100.out test101.out test102.out
|
||||||
|
|
||||||
.SUFFIXES: .in .out
|
.SUFFIXES: .in .out
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
|
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
|
||||||
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
|
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
|
||||||
#
|
#
|
||||||
# Last change: 2013 Nov 08
|
# Last change: 2013 Nov 12
|
||||||
#
|
#
|
||||||
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
|
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
|
||||||
# Edit the lines in the Configuration section below to select.
|
# Edit the lines in the Configuration section below to select.
|
||||||
@ -79,7 +79,7 @@ SCRIPT = test1.out test2.out test3.out test4.out test5.out \
|
|||||||
test82.out test83.out test84.out test88.out test89.out \
|
test82.out test83.out test84.out test88.out test89.out \
|
||||||
test90.out test91.out test92.out test93.out test94.out \
|
test90.out test91.out test92.out test93.out test94.out \
|
||||||
test95.out test96.out test97.out test98.out test99.out \
|
test95.out test96.out test97.out test98.out test99.out \
|
||||||
test100.out test101.out
|
test100.out test101.out test102.out
|
||||||
|
|
||||||
# Known problems:
|
# Known problems:
|
||||||
# Test 30: a problem around mac format - unknown reason
|
# Test 30: a problem around mac format - unknown reason
|
||||||
|
@ -30,7 +30,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
|
|||||||
test84.out test85.out test86.out test87.out test88.out \
|
test84.out test85.out test86.out test87.out test88.out \
|
||||||
test89.out test90.out test91.out test92.out test93.out \
|
test89.out test90.out test91.out test92.out test93.out \
|
||||||
test94.out test95.out test96.out test97.out test98.out \
|
test94.out test95.out test96.out test97.out test98.out \
|
||||||
test99.out test100.out test101.out
|
test99.out test100.out test101.out test102.out
|
||||||
|
|
||||||
SCRIPTS_GUI = test16.out
|
SCRIPTS_GUI = test16.out
|
||||||
|
|
||||||
|
12
src/testdir/test102.in
Normal file
12
src/testdir/test102.in
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
Test if fnameescape is correct for special chars like !
|
||||||
|
|
||||||
|
STARTTEST
|
||||||
|
:%d
|
||||||
|
:let fname = 'Xspa ce'
|
||||||
|
:try | exe "w! " . fnameescape(fname) | put='Space' | endtry
|
||||||
|
:let fname = 'Xemark!'
|
||||||
|
:try | exe "w! " . fnameescape(fname) | put='ExclamationMark' | endtry
|
||||||
|
:w! test.out
|
||||||
|
:qa!
|
||||||
|
ENDTEST
|
||||||
|
|
3
src/testdir/test102.ok
Normal file
3
src/testdir/test102.ok
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
|
||||||
|
Space
|
||||||
|
ExclamationMark
|
@ -738,6 +738,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 */
|
||||||
|
/**/
|
||||||
|
90,
|
||||||
/**/
|
/**/
|
||||||
89,
|
89,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user