Skip to content

Commit 45ba19b

Browse files
committed
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)
1 parent f04c346 commit 45ba19b

File tree

10 files changed

+27
-9
lines changed

10 files changed

+27
-9
lines changed

src/ex_getln.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3852,9 +3852,9 @@ vim_strsave_fnameescape(fname, shell)
38523852
char_u buf[20];
38533853
int j = 0;
38543854

3855-
/* Don't escape '[' and '{' if they are in 'isfname'. */
3855+
/* Don't escape '[', '{' and '!' if they are in 'isfname'. */
38563856
for (p = PATH_ESC_CHARS; *p != NUL; ++p)
3857-
if ((*p != '[' && *p != '{') || !vim_isfilec(*p))
3857+
if ((*p != '[' && *p != '{' && *p != '!') || !vim_isfilec(*p))
38583858
buf[j++] = *p;
38593859
buf[j] = NUL;
38603860
p = vim_strsave_escaped(fname, buf);

src/testdir/Make_amiga.mak

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
3434
test81.out test82.out test83.out test84.out test88.out \
3535
test89.out test90.out test91.out test92.out test93.out \
3636
test94.out test95.out test96.out test97.out test98.out \
37-
test99.out test100.out test101.out
37+
test99.out test100.out test101.out test102.out
3838

3939
.SUFFIXES: .in .out
4040

@@ -152,3 +152,4 @@ test98.out: test98.in
152152
test99.out: test99.in
153153
test100.out: test100.in
154154
test101.out: test101.in
155+
test102.out: test102.in

src/testdir/Make_dos.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
3333
test84.out test85.out test86.out test87.out test88.out \
3434
test89.out test90.out test91.out test92.out test93.out \
3535
test94.out test95.out test96.out test98.out test99.out \
36-
test100.out test101.out
36+
test100.out test101.out test102.out
3737

3838
SCRIPTS32 = test50.out test70.out
3939

src/testdir/Make_ming.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
5353
test84.out test85.out test86.out test87.out test88.out \
5454
test89.out test90.out test91.out test92.out test93.out \
5555
test94.out test95.out test96.out test98.out test99.out \
56-
test100out test101.out
56+
test100out test101.out test102.out
5757

5858
SCRIPTS32 = test50.out test70.out
5959

src/testdir/Make_os2.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
3535
test81.out test82.out test83.out test84.out test88.out \
3636
test89.out test90.out test91.out test92.out test93.out \
3737
test94.out test95.out test96.out test98.out test99.out \
38-
test100.out test101.out
38+
test100.out test101.out test102.out
3939

4040
.SUFFIXES: .in .out
4141

src/testdir/Make_vms.mms

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Authors: Zoltan Arpadffy, <[email protected]>
55
# Sandor Kopanyi, <[email protected]>
66
#
7-
# Last change: 2013 Nov 08
7+
# Last change: 2013 Nov 12
88
#
99
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
1010
# 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 \
7979
test82.out test83.out test84.out test88.out test89.out \
8080
test90.out test91.out test92.out test93.out test94.out \
8181
test95.out test96.out test97.out test98.out test99.out \
82-
test100.out test101.out
82+
test100.out test101.out test102.out
8383

8484
# Known problems:
8585
# Test 30: a problem around mac format - unknown reason

src/testdir/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
3030
test84.out test85.out test86.out test87.out test88.out \
3131
test89.out test90.out test91.out test92.out test93.out \
3232
test94.out test95.out test96.out test97.out test98.out \
33-
test99.out test100.out test101.out
33+
test99.out test100.out test101.out test102.out
3434

3535
SCRIPTS_GUI = test16.out
3636

src/testdir/test102.in

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Test if fnameescape is correct for special chars like !
2+
3+
STARTTEST
4+
:%d
5+
:let fname = 'Xspa ce'
6+
:try | exe "w! " . fnameescape(fname) | put='Space' | endtry
7+
:let fname = 'Xemark!'
8+
:try | exe "w! " . fnameescape(fname) | put='ExclamationMark' | endtry
9+
:w! test.out
10+
:qa!
11+
ENDTEST
12+

src/testdir/test102.ok

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
Space
3+
ExclamationMark

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,8 @@ static char *(features[]) =
738738

739739
static int included_patches[] =
740740
{ /* Add new patch number below this line */
741+
/**/
742+
90,
741743
/**/
742744
89,
743745
/**/

0 commit comments

Comments
 (0)