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)

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 906eb8bb0c72b11b6e1944d2eab0eefd016b828b..f1f39d2dcf1bc79b12159a9efd6f5e076940b790 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -3852,9 +3852,9 @@ vim_strsave_fnameescape(fname, shell)
     char_u     buf[20];
     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)
-       if ((*p != '[' && *p != '{') || !vim_isfilec(*p))
+       if ((*p != '[' && *p != '{' && *p != '!') || !vim_isfilec(*p))
            buf[j++] = *p;
     buf[j] = NUL;
     p = vim_strsave_escaped(fname, buf);

diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index 8842131b92865d6434029421a8fac0938719c9ac..c1d4e9d218c6d87d3b86dd17041af13712939584 100644 (file)
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -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 \
                test89.out test90.out test91.out test92.out test93.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
 
@@ -152,3 +152,4 @@ test98.out: test98.in
 test99.out: test99.in
 test100.out: test100.in
 test101.out: test101.in
+test102.out: test102.in

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 38208e748c4301847403fa7db9ac3057fdbc723f..40e040419499a362f963bc05b5105ae1825b74ad 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -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 \
                test89.out test90.out test91.out test92.out test93.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
 

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 9ec1f06e64df08e3535dc33adb0126680fa1d3be..16944fe0e8aeaf5455404fdb319b33800c100021 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -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 \
                test89.out test90.out test91.out test92.out test93.out \
                test94.out test95.out test96.out test98.out test99.out \
-               test100out test101.out
+               test100out test101.out test102.out
 
 SCRIPTS32 =    test50.out test70.out
 

diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index 823a706fab71bc0f6f6d28d5c0c38a43eef4a45c..38b566292a91087b58d56909eff942448869a3d0 100644 (file)
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -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 \
                test89.out test90.out test91.out test92.out test93.out \
                test94.out test95.out test96.out test98.out test99.out \
-               test100.out test101.out
+               test100.out test101.out test102.out
 
 .SUFFIXES: .in .out
 

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 2626b5bb9b461b745fb4ccf0eb1190c7e9c2a791..359f4cb245b005786962244299a888e9d95702ba 100644 (file)
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -4,7 +4,7 @@
 # Authors:     Zoltan Arpadffy, <arpadffy@polarhome.com>
 #              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.
 # 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 \
         test90.out test91.out test92.out test93.out test94.out \
         test95.out test96.out test97.out test98.out test99.out \
-        test100.out test101.out
+        test100.out test101.out test102.out
 
 # Known problems:
 # Test 30: a problem around mac format - unknown reason

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index aa3777c92ce99477f046b45bc5c6e8285b0bb058..afff50979664794aa353a4a27015e0d25dda12be 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -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 \
                test89.out test90.out test91.out test92.out test93.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
 

diff --git a/src/testdir/test102.in b/src/testdir/test102.in
new file mode 100644 (file)
index 0000000..35e9f6c
--- /dev/null
+++ b/src/testdir/test102.in
@@ -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
+

diff --git a/src/testdir/test102.ok b/src/testdir/test102.ok
new file mode 100644 (file)
index 0000000..a25fea1
--- /dev/null
+++ b/src/testdir/test102.ok
@@ -0,0 +1,3 @@
+
+Space
+ExclamationMark

diff --git a/src/version.c b/src/version.c
index e7a9c58316fbbf22b15894fb008c2184cb4641b6..41d07404cc974bc5618695fa50aa5b251b488206 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    90,
 /**/
     89,
 /**/