dcaee6
To: vim_dev@googlegroups.com
dcaee6
Subject: Patch 7.4.090
dcaee6
Fcc: outbox
dcaee6
From: Bram Moolenaar <Bram@moolenaar.net>
dcaee6
Mime-Version: 1.0
dcaee6
Content-Type: text/plain; charset=UTF-8
dcaee6
Content-Transfer-Encoding: 8bit
dcaee6
------------
dcaee6
dcaee6
Patch 7.4.090
dcaee6
Problem:    Win32: When a directory name contains an exclamation mark,
dcaee6
            completion doesn't complete the contents of the directory.
dcaee6
Solution:   Escape the exclamation mark. (Jan Stocker)
dcaee6
Files:      src/ex_getln.c, src/testdir/test102.in, src/testdir/test102.ok
dcaee6
            src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
dcaee6
            src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
dcaee6
            src/testdir/Make_vms.mms, src/testdir/Makefile
dcaee6
dcaee6
dcaee6
*** ../vim-7.4.089/src/ex_getln.c	2013-11-09 05:30:18.000000000 +0100
dcaee6
--- src/ex_getln.c	2013-11-12 05:23:15.000000000 +0100
dcaee6
***************
dcaee6
*** 3852,3860 ****
dcaee6
      char_u	buf[20];
dcaee6
      int		j = 0;
dcaee6
  
dcaee6
!     /* Don't escape '[' and '{' if they are in 'isfname'. */
dcaee6
      for (p = PATH_ESC_CHARS; *p != NUL; ++p)
dcaee6
! 	if ((*p != '[' && *p != '{') || !vim_isfilec(*p))
dcaee6
  	    buf[j++] = *p;
dcaee6
      buf[j] = NUL;
dcaee6
      p = vim_strsave_escaped(fname, buf);
dcaee6
--- 3852,3860 ----
dcaee6
      char_u	buf[20];
dcaee6
      int		j = 0;
dcaee6
  
dcaee6
!     /* Don't escape '[', '{' and '!' if they are in 'isfname'. */
dcaee6
      for (p = PATH_ESC_CHARS; *p != NUL; ++p)
dcaee6
! 	if ((*p != '[' && *p != '{' && *p != '!') || !vim_isfilec(*p))
dcaee6
  	    buf[j++] = *p;
dcaee6
      buf[j] = NUL;
dcaee6
      p = vim_strsave_escaped(fname, buf);
dcaee6
*** ../vim-7.4.089/src/testdir/test102.in	2013-11-12 05:27:48.000000000 +0100
dcaee6
--- src/testdir/test102.in	2013-11-12 05:21:26.000000000 +0100
dcaee6
***************
dcaee6
*** 0 ****
dcaee6
--- 1,12 ----
dcaee6
+ Test if fnameescape is correct for special chars like !
dcaee6
+ 
dcaee6
+ STARTTEST
dcaee6
+ :%d
dcaee6
+ :let fname = 'Xspa ce'
dcaee6
+ :try | exe "w! " . fnameescape(fname) | put='Space' | endtry 
dcaee6
+ :let fname = 'Xemark!'
dcaee6
+ :try | exe "w! " . fnameescape(fname) | put='ExclamationMark' | endtry
dcaee6
+ :w! test.out
dcaee6
+ :qa!
dcaee6
+ ENDTEST
dcaee6
+ 
dcaee6
*** ../vim-7.4.089/src/testdir/test102.ok	2013-11-12 05:27:48.000000000 +0100
dcaee6
--- src/testdir/test102.ok	2013-11-12 05:21:19.000000000 +0100
dcaee6
***************
dcaee6
*** 0 ****
dcaee6
--- 1,3 ----
dcaee6
+ 
dcaee6
+ Space
dcaee6
+ ExclamationMark
dcaee6
*** ../vim-7.4.089/src/testdir/Make_amiga.mak	2013-11-08 04:30:06.000000000 +0100
dcaee6
--- src/testdir/Make_amiga.mak	2013-11-12 05:20:03.000000000 +0100
dcaee6
***************
dcaee6
*** 34,40 ****
dcaee6
  		test81.out test82.out test83.out test84.out test88.out \
dcaee6
  		test89.out test90.out test91.out test92.out test93.out \
dcaee6
  		test94.out test95.out test96.out test97.out test98.out \
dcaee6
! 		test99.out test100.out test101.out
dcaee6
  
dcaee6
  .SUFFIXES: .in .out
dcaee6
  
dcaee6
--- 34,40 ----
dcaee6
  		test81.out test82.out test83.out test84.out test88.out \
dcaee6
  		test89.out test90.out test91.out test92.out test93.out \
dcaee6
  		test94.out test95.out test96.out test97.out test98.out \
dcaee6
! 		test99.out test100.out test101.out test102.out
dcaee6
  
dcaee6
  .SUFFIXES: .in .out
dcaee6
  
dcaee6
***************
dcaee6
*** 152,154 ****
dcaee6
--- 152,155 ----
dcaee6
  test99.out: test99.in
dcaee6
  test100.out: test100.in
dcaee6
  test101.out: test101.in
dcaee6
+ test102.out: test102.in
dcaee6
*** ../vim-7.4.089/src/testdir/Make_dos.mak	2013-11-08 04:30:06.000000000 +0100
dcaee6
--- src/testdir/Make_dos.mak	2013-11-12 05:20:10.000000000 +0100
dcaee6
***************
dcaee6
*** 33,39 ****
dcaee6
  		test84.out test85.out test86.out test87.out test88.out \
dcaee6
  		test89.out test90.out test91.out test92.out test93.out \
dcaee6
  		test94.out test95.out test96.out test98.out test99.out \
dcaee6
! 		test100.out test101.out
dcaee6
  
dcaee6
  SCRIPTS32 =	test50.out test70.out
dcaee6
  
dcaee6
--- 33,39 ----
dcaee6
  		test84.out test85.out test86.out test87.out test88.out \
dcaee6
  		test89.out test90.out test91.out test92.out test93.out \
dcaee6
  		test94.out test95.out test96.out test98.out test99.out \
dcaee6
! 		test100.out test101.out test102.out
dcaee6
  
dcaee6
  SCRIPTS32 =	test50.out test70.out
dcaee6
  
dcaee6
*** ../vim-7.4.089/src/testdir/Make_ming.mak	2013-11-08 04:30:06.000000000 +0100
dcaee6
--- src/testdir/Make_ming.mak	2013-11-12 05:20:14.000000000 +0100
dcaee6
***************
dcaee6
*** 53,59 ****
dcaee6
  		test84.out test85.out test86.out test87.out test88.out \
dcaee6
  		test89.out test90.out test91.out test92.out test93.out \
dcaee6
  		test94.out test95.out test96.out test98.out test99.out \
dcaee6
! 		test100out test101.out
dcaee6
  
dcaee6
  SCRIPTS32 =	test50.out test70.out
dcaee6
  
dcaee6
--- 53,59 ----
dcaee6
  		test84.out test85.out test86.out test87.out test88.out \
dcaee6
  		test89.out test90.out test91.out test92.out test93.out \
dcaee6
  		test94.out test95.out test96.out test98.out test99.out \
dcaee6
! 		test100out test101.out test102.out
dcaee6
  
dcaee6
  SCRIPTS32 =	test50.out test70.out
dcaee6
  
dcaee6
*** ../vim-7.4.089/src/testdir/Make_os2.mak	2013-11-08 04:30:06.000000000 +0100
dcaee6
--- src/testdir/Make_os2.mak	2013-11-12 05:20:18.000000000 +0100
dcaee6
***************
dcaee6
*** 35,41 ****
dcaee6
  		test81.out test82.out test83.out test84.out test88.out \
dcaee6
  		test89.out test90.out test91.out test92.out test93.out \
dcaee6
  		test94.out test95.out test96.out test98.out test99.out \
dcaee6
! 		test100.out test101.out
dcaee6
  
dcaee6
  .SUFFIXES: .in .out
dcaee6
  
dcaee6
--- 35,41 ----
dcaee6
  		test81.out test82.out test83.out test84.out test88.out \
dcaee6
  		test89.out test90.out test91.out test92.out test93.out \
dcaee6
  		test94.out test95.out test96.out test98.out test99.out \
dcaee6
! 		test100.out test101.out test102.out
dcaee6
  
dcaee6
  .SUFFIXES: .in .out
dcaee6
  
dcaee6
*** ../vim-7.4.089/src/testdir/Make_vms.mms	2013-11-08 04:30:06.000000000 +0100
dcaee6
--- src/testdir/Make_vms.mms	2013-11-12 05:20:21.000000000 +0100
dcaee6
***************
dcaee6
*** 4,10 ****
dcaee6
  # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
dcaee6
  #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
dcaee6
  #
dcaee6
! # Last change:  2013 Nov 08
dcaee6
  #
dcaee6
  # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
dcaee6
  # Edit the lines in the Configuration section below to select.
dcaee6
--- 4,10 ----
dcaee6
  # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
dcaee6
  #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
dcaee6
  #
dcaee6
! # Last change:  2013 Nov 12
dcaee6
  #
dcaee6
  # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
dcaee6
  # Edit the lines in the Configuration section below to select.
dcaee6
***************
dcaee6
*** 79,85 ****
dcaee6
  	 test82.out test83.out test84.out test88.out test89.out \
dcaee6
  	 test90.out test91.out test92.out test93.out test94.out \
dcaee6
  	 test95.out test96.out test97.out test98.out test99.out \
dcaee6
! 	 test100.out test101.out
dcaee6
  
dcaee6
  # Known problems:
dcaee6
  # Test 30: a problem around mac format - unknown reason
dcaee6
--- 79,85 ----
dcaee6
  	 test82.out test83.out test84.out test88.out test89.out \
dcaee6
  	 test90.out test91.out test92.out test93.out test94.out \
dcaee6
  	 test95.out test96.out test97.out test98.out test99.out \
dcaee6
! 	 test100.out test101.out test102.out
dcaee6
  
dcaee6
  # Known problems:
dcaee6
  # Test 30: a problem around mac format - unknown reason
dcaee6
*** ../vim-7.4.089/src/testdir/Makefile	2013-11-08 04:30:06.000000000 +0100
dcaee6
--- src/testdir/Makefile	2013-11-12 05:20:32.000000000 +0100
dcaee6
***************
dcaee6
*** 30,36 ****
dcaee6
  		test84.out test85.out test86.out test87.out test88.out \
dcaee6
  		test89.out test90.out test91.out test92.out test93.out \
dcaee6
  		test94.out test95.out test96.out test97.out test98.out \
dcaee6
! 		test99.out test100.out test101.out
dcaee6
  
dcaee6
  SCRIPTS_GUI = test16.out
dcaee6
  
dcaee6
--- 30,36 ----
dcaee6
  		test84.out test85.out test86.out test87.out test88.out \
dcaee6
  		test89.out test90.out test91.out test92.out test93.out \
dcaee6
  		test94.out test95.out test96.out test97.out test98.out \
dcaee6
! 		test99.out test100.out test101.out test102.out
dcaee6
  
dcaee6
  SCRIPTS_GUI = test16.out
dcaee6
  
dcaee6
*** ../vim-7.4.089/src/version.c	2013-11-12 05:11:58.000000000 +0100
dcaee6
--- src/version.c	2013-11-12 05:24:24.000000000 +0100
dcaee6
***************
dcaee6
*** 740,741 ****
dcaee6
--- 740,743 ----
dcaee6
  {   /* Add new patch number below this line */
dcaee6
+ /**/
dcaee6
+     90,
dcaee6
  /**/
dcaee6
dcaee6
-- 
dcaee6
If you don't get everything you want, think of
dcaee6
everything you didn't get and don't want.
dcaee6
dcaee6
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
dcaee6
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
dcaee6
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
dcaee6
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///