- fix syntax patch (#203798)

- patchlevel 66
This commit is contained in:
Karsten Hopp 2006-08-24 09:23:56 +00:00
parent a800df24eb
commit c13ccfc34d
5 changed files with 182 additions and 1 deletions

66
7.0.064 Normal file
View File

@ -0,0 +1,66 @@
To: vim-dev@vim.org
Subject: Patch 7.0.064
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.0.064
Problem: Using uninitialized variable. (Tony Mechelynck)
Solution: When not used set "temp" to zero. Also avoid a warning for
"files" in ins_compl_dictionaries().
Files: src/edit.c
*** ../vim-7.0.063/src/edit.c Wed Aug 16 21:26:19 2006
--- src/edit.c Thu Aug 17 22:28:34 2006
***************
*** 2760,2765 ****
--- 2760,2766 ----
}
else
# endif
+ if (count > 0) /* avoid warning for using "files" uninit */
{
ins_compl_files(count, files, thesaurus, flags,
&regmatch, buf, &dir);
***************
*** 3222,3228 ****
int c;
{
char_u *ptr;
- int temp;
int want_cindent;
int retval = FALSE;
--- 3223,3228 ----
***************
*** 3378,3383 ****
--- 3378,3384 ----
if (compl_curr_match != NULL || compl_leader != NULL || c == Ctrl_E)
{
char_u *p;
+ int temp = 0;
/*
* If any of the original typed text has been changed, eg when
*** ../vim-7.0.063/src/version.c Wed Aug 16 22:03:35 2006
--- src/version.c Tue Aug 22 19:56:05 2006
***************
*** 668,669 ****
--- 668,671 ----
{ /* Add new patch number below this line */
+ /**/
+ 64,
/**/
--
hundred-and-one symptoms of being an internet addict:
200. You really believe in the concept of a "paperless" office.
/// 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 ///

52
7.0.065 Normal file
View File

@ -0,0 +1,52 @@
To: vim-dev@vim.org
Subject: Patch 7.0.065 (extra)
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.0.065 (extra)
Problem: Mac: left-right movement of the scrollwheel causes up-down
scrolling.
Solution: Ignore mouse wheel events that are not up-down. (Nicolas Weber)
Files: src/gui_mac.c
*** ../vim-7.0.064/src/gui_mac.c Wed May 3 00:03:26 2006
--- src/gui_mac.c Tue Aug 22 13:41:12 2006
***************
*** 2480,2485 ****
--- 2480,2491 ----
UInt32 mod;
SInt32 delta;
int_u vim_mod;
+ EventMouseWheelAxis axis;
+
+ if (noErr == GetEventParameter(theEvent, kEventParamMouseWheelAxis,
+ typeMouseWheelAxis, NULL, sizeof(axis), NULL, &axis)
+ && axis != kEventMouseWheelAxisY)
+ goto bail; /* Vim only does up-down scrolling */
if (noErr != GetEventParameter(theEvent, kEventParamMouseWheelDelta,
typeSInt32, NULL, sizeof(SInt32), NULL, &delta))
*** ../vim-7.0.064/src/version.c Tue Aug 22 19:58:22 2006
--- src/version.c Tue Aug 22 21:38:07 2006
***************
*** 668,669 ****
--- 668,671 ----
{ /* Add new patch number below this line */
+ /**/
+ 65,
/**/
--
Spam seems to be something useful to novices. Later you realize that
it's a bunch of indigestable junk that only clogs your system.
Applies to both the food and the e-mail!
/// 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 ///

49
7.0.066 Normal file
View File

@ -0,0 +1,49 @@
To: vim-dev@vim.org
Subject: Patch 7.0.066
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.0.066
Problem: After the popup menu for Insert mode completion overlaps the tab
pages line it is not completely removed.
Solution: Redraw the tab pages line after removing the popup menu. (Ori
Avtalion)
Files: src/popupmnu.c
*** ../vim-7.0.065/src/popupmnu.c Fri Apr 21 00:12:29 2006
--- src/popupmnu.c Tue Aug 22 16:10:55 2006
***************
*** 552,557 ****
--- 552,560 ----
{
pum_array = NULL;
redraw_all_later(SOME_VALID);
+ #ifdef FEAT_WINDOWS
+ redraw_tabline = TRUE;
+ #endif
status_redraw_all();
}
*** ../vim-7.0.065/src/version.c Tue Aug 22 21:39:18 2006
--- src/version.c Tue Aug 22 21:50:34 2006
***************
*** 668,669 ****
--- 668,671 ----
{ /* Add new patch number below this line */
+ /**/
+ 66,
/**/
--
panic("Foooooooood fight!");
-- In the kernel source aha1542.c, after detecting a bad segment list
/// 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

@ -88,3 +88,6 @@ Individual patches for Vim 7.0:
2249 7.0.061 crash in Vim command completion when nothing to complete
4075 7.0.062 Mac: crash when using popup menu with spell error
1295 7.0.063 tiny chance for a memory leak
1818 7.0.064 compiler warnings for unused variables
1750 7.0.065 (extra) Mac: horizontal scroll wheel caused vertical scroll
1407 7.0.066 tab pages line not redrawn after removing the popup menu

View File

@ -15,7 +15,7 @@
#used for pre-releases:
%define beta %{nil}
%define vimdir vim70%{?beta}
%define patchlevel 063
%define patchlevel 066
Summary: The VIM editor.
Name: vim
@ -108,6 +108,9 @@ Patch060: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.060
Patch061: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.061
Patch062: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.062
Patch063: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.063
Patch064: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.064
Patch065: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.065
Patch066: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.066
Patch3000: vim-7.0-syntax.patch
@ -302,6 +305,10 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch061 -p0
%patch062 -p0
%patch063 -p0
%patch064 -p0
# Mac:
#patch065 -p0
%patch066 -p0
%patch3000 -p1
%patch3001 -p1
@ -625,6 +632,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
* Thu Aug 24 2006 Karsten Hopp <karsten@redhat.de> 7.0.066-1
- fix syntax patch (#203798)
- patchlevel 66
* Wed Aug 17 2006 Karsten Hopp <karsten@redhat.de> 7.0.063-1
- Patchlevel 63