- patchlevel 119

This commit is contained in:
Karsten Hopp 2007-09-25 13:16:28 +00:00
parent 22b0f1717e
commit de97d74543
3 changed files with 73 additions and 2 deletions

59
7.1.119 Normal file
View File

@ -0,0 +1,59 @@
To: vim-dev@vim.org
Subject: patch 7.1.119
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.1.119
Problem: Crash when 'cmdheight' set to very large value. (A.Politz)
Solution: Limit 'cmdheight' to 'lines' minus one. Store right value of
'cmdheight' when running out of room.
Files: src/option.c, src/window.c
*** ../vim-7.1.118/src/option.c Thu Sep 6 16:33:47 2007
--- src/option.c Tue Sep 25 12:17:35 2007
***************
*** 7824,7829 ****
--- 7824,7831 ----
errmsg = e_positive;
p_ch = 1;
}
+ if (p_ch > Rows - min_rows() + 1)
+ p_ch = Rows - min_rows() + 1;
/* Only compute the new window layout when startup has been
* completed. Otherwise the frame sizes may be wrong. */
*** ../vim-7.1.118/src/window.c Thu Sep 13 18:25:08 2007
--- src/window.c Tue Sep 25 12:13:56 2007
***************
*** 5523,5528 ****
--- 5523,5529 ----
{
EMSG(_(e_noroom));
p_ch = old_p_ch;
+ curtab->tp_ch_used = p_ch;
cmdline_row = Rows - p_ch;
break;
}
*** ../vim-7.1.118/src/version.c Tue Sep 25 14:19:35 2007
--- src/version.c Tue Sep 25 14:48:14 2007
***************
*** 668,669 ****
--- 668,671 ----
{ /* Add new patch number below this line */
+ /**/
+ 119,
/**/
--
Q: Why does /dev/null accept only integers?
A: You can't sink a float.
/// 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

@ -145,3 +145,6 @@ Individual patches for Vim 7.1:
1386 7.1.114 memory leak in getmatches()
1472 7.1.115 (after 7.1.105) compiler warning for uninitialized variable
3137 7.1.116 can't display characters above 0x10000
1414 7.1.117 can't check wether Vim was compiled with Gnome
1805 7.1.118 (after 7.1.107) compiler warning for Visual C compiler
1761 7.1.119 crash after setting 'cmdheight' to huge value

View File

@ -15,7 +15,7 @@
#used for pre-releases:
%define beta %{nil}
%define vimdir vim71%{?beta}
%define patchlevel 116
%define patchlevel 119
Summary: The VIM editor
URL: http://www.vim.org/
@ -176,6 +176,9 @@ Patch113: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.113
Patch114: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.114
Patch115: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.115
Patch116: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.116
Patch117: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.117
Patch118: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.118
Patch119: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.119
Patch3000: vim-7.0-syntax.patch
Patch3002: vim-7.1-nowarnings.patch
@ -436,6 +439,9 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch114 -p0
%patch115 -p0
%patch116 -p0
%patch117 -p0
%patch118 -p0
%patch119 -p0
# install spell files
%if %{withvimspell}
@ -821,7 +827,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
* Mon Sep 24 2007 Karsten Hopp <karsten@redhat.com> 7.1.%{nil}116-1
* Tue Sep 25 2007 Karsten Hopp <karsten@redhat.com> 7.1.119-1
- patchlevel 119
* Mon Sep 24 2007 Karsten Hopp <karsten@redhat.com> 7.1.116-1
- patchlevel 116
* Fri Sep 07 2007 Karsten Hopp <karsten@redhat.com> 7.1.100-1