- patchlevel 410
This commit is contained in:
Karsten Hopp
parent
6b58d9bfd3
commit
105fb0950b
78
7.2.410
Normal file
78
7.2.410
Normal file
@ -0,0 +1,78 @@
|
||||
To: vim-dev@vim.org
|
||||
Subject: Patch 7.2.410
|
||||
Fcc: outbox
|
||||
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||
Mime-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
------------
|
||||
|
||||
Patch 7.2.410
|
||||
Problem: Highlighting directories for completion doesn't work properly.
|
||||
Solution: Don't halve backslashes when not needed, expaned "~/".
|
||||
(Dominique Pelle)
|
||||
Files: src/ex_getln.c
|
||||
|
||||
|
||||
*** ../vim-7.2.409/src/ex_getln.c 2010-03-17 19:13:19.000000000 +0100
|
||||
--- src/ex_getln.c 2010-03-23 18:00:56.000000000 +0100
|
||||
***************
|
||||
*** 3948,3959 ****
|
||||
|| xp->xp_context == EXPAND_SHELLCMD
|
||||
|| xp->xp_context == EXPAND_BUFFERS)
|
||||
{
|
||||
- char_u *halved_slash;
|
||||
-
|
||||
/* highlight directories */
|
||||
! halved_slash = backslash_halve_save(files_found[k]);
|
||||
! j = mch_isdir(halved_slash);
|
||||
! vim_free(halved_slash);
|
||||
if (showtail)
|
||||
p = L_SHOWFILE(k);
|
||||
else
|
||||
--- 3948,3973 ----
|
||||
|| xp->xp_context == EXPAND_SHELLCMD
|
||||
|| xp->xp_context == EXPAND_BUFFERS)
|
||||
{
|
||||
/* highlight directories */
|
||||
! if (xp->xp_numfiles != -1)
|
||||
! {
|
||||
! char_u *halved_slash;
|
||||
! char_u *exp_path;
|
||||
!
|
||||
! /* Expansion was done before and special characters
|
||||
! * were escaped, need to halve backslashes. Also
|
||||
! * $HOME has been replaced with ~/. */
|
||||
! exp_path = expand_env_save_opt(files_found[k], TRUE);
|
||||
! halved_slash = backslash_halve_save(
|
||||
! exp_path != NULL ? exp_path : files_found[k]);
|
||||
! j = mch_isdir(halved_slash != NULL ? halved_slash
|
||||
! : files_found[k]);
|
||||
! vim_free(exp_path);
|
||||
! vim_free(halved_slash);
|
||||
! }
|
||||
! else
|
||||
! /* Expansion was done here, file names are literal. */
|
||||
! j = mch_isdir(files_found[k]);
|
||||
if (showtail)
|
||||
p = L_SHOWFILE(k);
|
||||
else
|
||||
*** ../vim-7.2.409/src/version.c 2010-03-23 17:49:19.000000000 +0100
|
||||
--- src/version.c 2010-03-23 18:04:25.000000000 +0100
|
||||
***************
|
||||
*** 683,684 ****
|
||||
--- 683,686 ----
|
||||
{ /* Add new patch number below this line */
|
||||
+ /**/
|
||||
+ 410,
|
||||
/**/
|
||||
|
||||
--
|
||||
BRIDGEKEEPER: What is your favorite colour?
|
||||
GAWAIN: Blue ... No yelloooooww!
|
||||
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
||||
|
||||
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
||||
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
||||
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
||||
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
||||
@ -435,3 +435,10 @@ Individual patches for Vim 7.2:
|
||||
1982 7.2.401 wildmode list doesn't highlight directory names with a space
|
||||
2649 7.2.402 error 705 when re-using funcref variable
|
||||
1548 7.2.403 (after 7.2.400) compiler warning for pointer type
|
||||
1880 7.2.404 pointers for composing characters are not properly initialized
|
||||
1636 7.2.405 with small features match is not highlighted for ":s/p/r/c"
|
||||
4701 7.2.406 (after 7.2.119) uninit memory read
|
||||
1916 7.2.407 when using :s with an expression backslashes are dropped
|
||||
2152 7.2.408 ":g/the/s/a/b/" can set '[ and '] marks to an unchanged line
|
||||
1814 7.2.409 summary of number of substitutes is incorrect for ":folddo"
|
||||
2526 7.2.410 highlighting directories for completion doesn't work properly
|
||||
|
||||
19
vim.spec
19
vim.spec
@ -18,7 +18,7 @@
|
||||
#used for pre-releases:
|
||||
%define beta %{nil}
|
||||
%define vimdir vim72%{?beta}
|
||||
%define patchlevel 403
|
||||
%define patchlevel 410
|
||||
|
||||
Summary: The VIM editor
|
||||
URL: http://www.vim.org/
|
||||
@ -469,6 +469,13 @@ Patch400: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.400
|
||||
Patch401: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.401
|
||||
Patch402: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.402
|
||||
Patch403: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.403
|
||||
Patch404: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.404
|
||||
Patch405: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.405
|
||||
Patch406: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.406
|
||||
Patch407: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.407
|
||||
Patch408: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.408
|
||||
Patch409: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.409
|
||||
Patch410: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.410
|
||||
|
||||
Patch3000: vim-7.0-syntax.patch
|
||||
Patch3002: vim-7.1-nowarnings.patch
|
||||
@ -1010,6 +1017,13 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
|
||||
%patch401 -p0
|
||||
%patch402 -p0
|
||||
%patch403 -p0
|
||||
%patch404 -p0
|
||||
%patch405 -p0
|
||||
%patch406 -p0
|
||||
%patch407 -p0
|
||||
%patch408 -p0
|
||||
%patch409 -p0
|
||||
%patch410 -p0
|
||||
|
||||
|
||||
# install spell files
|
||||
@ -1474,6 +1488,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/icons/hicolor/*/apps/*
|
||||
|
||||
%changelog
|
||||
* Tue Mar 23 2010 Karsten Hopp <karsten@redhat.com> 7.2.410-1
|
||||
- patchlevel 410
|
||||
|
||||
* Sat Mar 20 2010 Karsten Hopp <karsten@redhat.com> 7.2.403-1
|
||||
- patchlevel 403
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user