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