- patchlevel 399

This commit is contained in:
Karsten Hopp 2010-03-17 17:12:39 +00:00
parent 88aacb49bc
commit da4248c956
3 changed files with 82 additions and 1 deletions

63
7.2.399 Normal file
View File

@ -0,0 +1,63 @@
To: vim-dev@vim.org
Subject: Patch 7.2.399 (extra)
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.399 (extra, after 7.2.388)
Problem: Cannot compile on MingW.
Solution: Move ifneq to separate line. (Vlad Sandrini, Dominique Pelle)
Files: src/Make_ming.mak
*** ../vim-7.2.398/src/Make_ming.mak 2010-03-10 13:19:28.000000000 +0100
--- src/Make_ming.mak 2010-03-17 17:23:31.000000000 +0100
***************
*** 215,226 ****
ifndef RUBY_PLATFORM
ifeq ($(RUBY_VER), 16)
RUBY_PLATFORM = i586-mswin32
! else ifneq ("X$(wildcard, $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32)", X)
RUBY_PLATFORM = i386-mingw32
else
RUBY_PLATFORM = i386-mswin32
endif
endif
ifndef RUBY_INSTALL_NAME
ifeq ($(RUBY_VER), 16)
--- 215,228 ----
ifndef RUBY_PLATFORM
ifeq ($(RUBY_VER), 16)
RUBY_PLATFORM = i586-mswin32
! else
! ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32),)
RUBY_PLATFORM = i386-mingw32
else
RUBY_PLATFORM = i386-mswin32
endif
endif
+ endif
ifndef RUBY_INSTALL_NAME
ifeq ($(RUBY_VER), 16)
*** ../vim-7.2.398/src/version.c 2010-03-17 16:54:51.000000000 +0100
--- src/version.c 2010-03-17 17:23:40.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
{ /* Add new patch number below this line */
+ /**/
+ 399,
/**/
--
Life is a gift, living is an art. (Bram Moolenaar)
/// 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 ///

View File

@ -425,3 +425,8 @@ Individual patches for Vim 7.2:
4898 7.2.392 netbeans hangs reading from a socket at the maximum block size 4898 7.2.392 netbeans hangs reading from a socket at the maximum block size
9605 7.2.393 Mac: Can't build with different Xcode developer tools dir 9605 7.2.393 Mac: Can't build with different Xcode developer tools dir
4298 7.2.394 .lzma and .xz files are not supported 4298 7.2.394 .lzma and .xz files are not supported
1554 7.2.395 in help CTRL=] on g?g? escapes the ?, causing it to fail
1554 7.2.396 get E38 errors
1722 7.2.397 redundant check for w_lines_valid
4127 7.2.398 when moving windows the cursor ends up in the wrong line
1784 7.2.399 (extra, after 7.2.388) cannot compile on MingW

View File

@ -18,7 +18,7 @@
#used for pre-releases: #used for pre-releases:
%define beta %{nil} %define beta %{nil}
%define vimdir vim72%{?beta} %define vimdir vim72%{?beta}
%define patchlevel 394 %define patchlevel 399
Summary: The VIM editor Summary: The VIM editor
URL: http://www.vim.org/ URL: http://www.vim.org/
@ -460,6 +460,11 @@ Patch391: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.391
Patch392: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.392 Patch392: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.392
Patch393: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.393 Patch393: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.393
Patch394: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.394 Patch394: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.394
Patch395: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.395
Patch396: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.396
Patch397: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.397
Patch398: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.398
Patch399: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.399
Patch3000: vim-7.0-syntax.patch Patch3000: vim-7.0-syntax.patch
Patch3002: vim-7.1-nowarnings.patch Patch3002: vim-7.1-nowarnings.patch
@ -992,6 +997,11 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch392 -p0 %patch392 -p0
%patch393 -p0 %patch393 -p0
%patch394 -p0 %patch394 -p0
%patch395 -p0
%patch396 -p0
%patch397 -p0
%patch398 -p0
%patch399 -p0
# install spell files # install spell files
@ -1456,6 +1466,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/apps/*
%changelog %changelog
* Wed Mar 17 2010 Karsten Hopp <karsten@redhat.com> 7.2.399-1
- patchlevel 399
* Wed Mar 10 2010 Karsten Hopp <karsten@redhat.com> 7.2.394-1 * Wed Mar 10 2010 Karsten Hopp <karsten@redhat.com> 7.2.394-1
- patchlevel 394 - patchlevel 394