rpms/vim/F-7 7.1.003, NONE, 1.1 7.1.004, NONE, 1.1 7.1.005, NONE, 1.1 7.1.006, NONE, 1.1 7.1.007, NONE, 1.1 7.1.008, NONE, 1.1 7.1.009, NONE, 1.1 7.1.010, NONE, 1.1 7.1.011, NONE, 1.1 7.1.012, NONE, 1.1 README.patches, 1.77, 1.78 vim.spec, 1.167, 1.168
Karsten Hopp (karsten)
fedora-extras-commits at redhat.com
Wed Jun 27 08:36:42 UTC 2007
Author: karsten
Update of /cvs/extras/rpms/vim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17460
Modified Files:
README.patches vim.spec
Added Files:
7.1.003 7.1.004 7.1.005 7.1.006 7.1.007 7.1.008 7.1.009
7.1.010 7.1.011 7.1.012
Log Message:
Update F-7 vim to patchlevel 12, too
--- NEW FILE 7.1.003 ---
To: vim-dev at vim.org
Subject: patch 7.1.003 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.1.003 (extra)
Problem: The "Tear off this menu" message appears in the message history
when using a menu. (Yongwei Wu)
Solution: Disable message history when displaying the menu tip.
Files: src/gui_w32.c
*** ../vim-7.1.002/src/gui_w32.c Thu May 10 22:17:22 2007
--- src/gui_w32.c Sat Jun 9 13:43:07 2007
***************
*** 1051,1057 ****
--- 1051,1059 ----
if (pMenu != NULL && pMenu->strings[MENU_INDEX_TIP] != 0
&& GetMenuState(s_menuBar, pMenu->id, MF_BYCOMMAND) != -1)
{
+ ++msg_hist_off;
msg(pMenu->strings[MENU_INDEX_TIP]);
+ --msg_hist_off;
setcursor();
out_flush();
did_menu_tip = TRUE;
*** ../vim-7.1.002/src/version.c Tue May 15 09:14:33 2007
--- src/version.c Tue Jun 19 10:08:17 2007
***************
*** 668,669 ****
--- 668,671 ----
{ /* Add new patch number below this line */
+ /**/
+ 3,
/**/
--
In his lifetime van Gogh painted 486 oil paintings. Oddly enough, 8975
of them are to be found in the United States.
/// Bram Moolenaar -- Bram at 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 ///
--- NEW FILE 7.1.004 ---
To: vim-dev at vim.org
Subject: patch 7.1.004
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.1.004
Problem: Crash when doing ":next directory". (Raphael Finkel)
Solution: Do not use "buf", it may be invalid after autocommands.
Files: src/ex_cmds.c
*** ../vim-7.1.003/src/ex_cmds.c Thu May 10 21:24:24 2007
--- src/ex_cmds.c Mon Jun 18 22:03:56 2007
***************
*** 3367,3373 ****
* was in this window (or another window). If not used
* before, reset the local window options to the global
* values. Also restores old folding stuff. */
! get_winopts(buf);
#ifdef FEAT_SPELL
did_get_winopts = TRUE;
#endif
--- 3367,3373 ----
* was in this window (or another window). If not used
* before, reset the local window options to the global
* values. Also restores old folding stuff. */
! get_winopts(curbuf);
#ifdef FEAT_SPELL
did_get_winopts = TRUE;
#endif
***************
*** 3649,3656 ****
#ifdef FEAT_SPELL
/* If the window options were changed may need to set the spell language.
* Can only do this after the buffer has been properly setup. */
! if (did_get_winopts && curwin->w_p_spell && *buf->b_p_spl != NUL)
! did_set_spelllang(buf);
#endif
if (command == NULL)
--- 3649,3656 ----
#ifdef FEAT_SPELL
/* If the window options were changed may need to set the spell language.
* Can only do this after the buffer has been properly setup. */
! if (did_get_winopts && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
! did_set_spelllang(curbuf);
#endif
if (command == NULL)
*** ../vim-7.1.003/src/version.c Tue Jun 19 10:09:15 2007
--- src/version.c Tue Jun 19 11:53:34 2007
***************
*** 668,669 ****
--- 668,671 ----
{ /* Add new patch number below this line */
+ /**/
+ 4,
/**/
--
FIRST HEAD: Oh! quick! get the sword out I want to cut his head off.
THIRD HEAD: Oh, cut your own head off.
SECOND HEAD: Yes - do us all a favour.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- Bram at 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 ///
--- NEW FILE 7.1.005 ---
To: vim-dev at vim.org
Subject: patch 7.1.005
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.1.005
Problem: "cit" used on <foo></foo> deletes <foo>. Should not delete
anything and start insertion, like "ci'" does on "". (Michal
Bozon)
Solution: Handle an empty object specifically. Made it work consistent for
various text objects.
Files: src/search.c
*** ../vim-7.1.004/src/search.c Thu May 10 20:54:46 2007
--- src/search.c Mon Jun 4 12:31:04 2007
***************
*** 3600,3612 ****
{
oap->start = start_pos;
oap->motion_type = MCHAR;
if (sol)
- {
incl(&curwin->w_cursor);
! oap->inclusive = FALSE;
! }
! else
oap->inclusive = TRUE;
}
return OK;
--- 3600,3615 ----
{
oap->start = start_pos;
oap->motion_type = MCHAR;
+ oap->inclusive = FALSE;
if (sol)
incl(&curwin->w_cursor);
! else if (lt(start_pos, curwin->w_cursor))
! /* Include the character under the cursor. */
oap->inclusive = TRUE;
+ else
+ /* End is before the start (no text in between <>, [], etc.): don't
+ * operate on any text. */
+ curwin->w_cursor = start_pos;
}
return OK;
***************
*** 3734,3740 ****
if (in_html_tag(FALSE))
{
! /* cursor on start tag, move to just after it */
while (*ml_get_cursor() != '>')
if (inc_cursor() < 0)
break;
--- 3737,3743 ----
if (in_html_tag(FALSE))
{
! /* cursor on start tag, move to its '>' */
while (*ml_get_cursor() != '>')
if (inc_cursor() < 0)
break;
***************
*** 3838,3844 ****
/* Exclude the start tag. */
curwin->w_cursor = start_pos;
while (inc_cursor() >= 0)
! if (*ml_get_cursor() == '>' && lt(curwin->w_cursor, end_pos))
{
inc_cursor();
start_pos = curwin->w_cursor;
--- 3841,3847 ----
/* Exclude the start tag. */
curwin->w_cursor = start_pos;
while (inc_cursor() >= 0)
! if (*ml_get_cursor() == '>')
{
inc_cursor();
start_pos = curwin->w_cursor;
***************
*** 3860,3866 ****
#ifdef FEAT_VISUAL
if (VIsual_active)
{
! if (*p_sel == 'e')
++curwin->w_cursor.col;
VIsual = start_pos;
VIsual_mode = 'v';
--- 3863,3873 ----
#ifdef FEAT_VISUAL
if (VIsual_active)
{
! /* If the end is before the start there is no text between tags, select
! * the char under the cursor. */
! if (lt(end_pos, start_pos))
! curwin->w_cursor = start_pos;
! else if (*p_sel == 'e')
++curwin->w_cursor.col;
VIsual = start_pos;
VIsual_mode = 'v';
***************
*** 3872,3878 ****
{
oap->start = start_pos;
oap->motion_type = MCHAR;
! oap->inclusive = TRUE;
}
retval = OK;
--- 3879,3893 ----
{
oap->start = start_pos;
oap->motion_type = MCHAR;
! if (lt(end_pos, start_pos))
! {
! /* End is before the start: there is no text between tags; operate
! * on an empty area. */
! curwin->w_cursor = start_pos;
! oap->inclusive = FALSE;
! }
! else
! oap->inclusive = TRUE;
}
retval = OK;
*** ../vim-7.1.004/src/version.c Tue Jun 19 11:54:23 2007
--- src/version.c Tue Jun 19 12:57:03 2007
***************
*** 668,669 ****
--- 668,671 ----
{ /* Add new patch number below this line */
+ /**/
+ 5,
/**/
--
Life would be so much easier if we could just look at the source code.
/// Bram Moolenaar -- Bram at 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 ///
--- NEW FILE 7.1.006 ---
To: vim-dev at vim.org
Subject: patch 7.1.006
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.1.006
Problem: Resetting 'modified' in a StdinReadPost autocommand doesn't work.
Solution: Set 'modified' before the autocommands instead of after it.
Files: src/buffer.c
*** ../vim-7.1.005/src/buffer.c Thu May 10 18:43:46 2007
--- src/buffer.c Fri Jun 8 20:59:04 2007
***************
*** 171,176 ****
--- 171,183 ----
/* Put the cursor on the first line. */
curwin->w_cursor.lnum = 1;
curwin->w_cursor.col = 0;
+
+ /* Set or reset 'modified' before executing autocommands, so that
+ * it can be changed there. */
+ if (!readonlymode && !bufempty())
+ changed();
+ else if (retval != FAIL)
+ unchanged(curbuf, FALSE);
#ifdef FEAT_AUTOCMD
# ifdef FEAT_EVAL
apply_autocmds_retval(EVENT_STDINREADPOST, NULL, NULL, FALSE,
***************
*** 194,209 ****
/* When reading stdin, the buffer contents always needs writing, so set
* the changed flag. Unless in readonly mode: "ls | gview -".
* When interrupted and 'cpoptions' contains 'i' set changed flag. */
! if ((read_stdin && !readonlymode && !bufempty())
#ifdef FEAT_AUTOCMD
|| modified_was_set /* ":set modified" used in autocmd */
# ifdef FEAT_EVAL
|| (aborting() && vim_strchr(p_cpo, CPO_INTMOD) != NULL)
# endif
#endif
! || (got_int && vim_strchr(p_cpo, CPO_INTMOD) != NULL))
changed();
! else if (retval != FAIL)
unchanged(curbuf, FALSE);
save_file_ff(curbuf); /* keep this fileformat */
--- 201,216 ----
/* When reading stdin, the buffer contents always needs writing, so set
* the changed flag. Unless in readonly mode: "ls | gview -".
* When interrupted and 'cpoptions' contains 'i' set changed flag. */
! if ((got_int && vim_strchr(p_cpo, CPO_INTMOD) != NULL)
#ifdef FEAT_AUTOCMD
|| modified_was_set /* ":set modified" used in autocmd */
# ifdef FEAT_EVAL
|| (aborting() && vim_strchr(p_cpo, CPO_INTMOD) != NULL)
# endif
#endif
! )
changed();
! else if (retval != FAIL && !read_stdin)
unchanged(curbuf, FALSE);
save_file_ff(curbuf); /* keep this fileformat */
*** ../vim-7.1.005/src/version.c Tue Jun 19 12:58:55 2007
--- src/version.c Tue Jun 19 15:37:53 2007
***************
*** 668,669 ****
--- 668,671 ----
{ /* Add new patch number below this line */
+ /**/
+ 6,
/**/
--
If I tell you "you have a beautiful body", would you hold it against me?
/// Bram Moolenaar -- Bram at 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 ///
--- NEW FILE 7.1.007 ---
To: vim-dev at vim.org
Subject: patch 7.1.007 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.1.007 (extra)
Problem: Mac: Context menu doesn't work on Intel Macs.
Scrollbars are not dimmed when Vim is not the active application.
Solution: Remove the test whether context menus are supported. They are
always there in OS/X. Handle the dimming. (Nicolas Weber)
Files: src/gui_mac.c, src/gui.h
*** ../vim-7.1.006/src/gui_mac.c Thu May 10 20:07:25 2007
--- src/gui_mac.c Sat Jun 9 14:19:25 2007
***************
*** 1676,1688 ****
/* TODO: NEEDED? */
clickIsPopup = FALSE;
! if ((gui.MacOSHaveCntxMenu) && (mouse_model_popup()))
! if (IsShowContextualMenuClick(theEvent))
! {
! vimMouseButton = MOUSE_RIGHT;
! vimModifiers &= ~MOUSE_CTRL;
! clickIsPopup = TRUE;
! }
/* Is it a double click ? */
dblClick = ((theEvent->when - lastMouseTick) < GetDblTime());
--- 1676,1687 ----
/* TODO: NEEDED? */
clickIsPopup = FALSE;
! if (mouse_model_popup() && IsShowContextualMenuClick(theEvent))
! {
! vimMouseButton = MOUSE_RIGHT;
! vimModifiers &= ~MOUSE_CTRL;
! clickIsPopup = TRUE;
! }
/* Is it a double click ? */
dblClick = ((theEvent->when - lastMouseTick) < GetDblTime());
***************
*** 1920,1943 ****
WindowPtr whichWindow;
whichWindow = (WindowPtr) event->message;
! if ((event->modifiers) & activeFlag)
! /* Activate */
! gui_focus_change(TRUE);
! else
{
! /* Deactivate */
! gui_focus_change(FALSE);
! /* DON'T KNOW what the code below was doing
! found in the deactivate clause, but the
! clause writing TRUE into in_focus (BUG)
! */
!
! #if 0 /* Removed by Dany as per above June 2001 */
! a_bool = false;
! SetPreserveGlyph(a_bool);
! SetOutlinePreferred(a_bool);
! #endif
}
}
--- 1919,1937 ----
WindowPtr whichWindow;
whichWindow = (WindowPtr) event->message;
! /* Dim scrollbars */
! if (whichWindow == gui.VimWindow)
{
! ControlRef rootControl;
! GetRootControl(gui.VimWindow, &rootControl);
! if ((event->modifiers) & activeFlag)
! ActivateControl(rootControl);
! else
! DeactivateControl(rootControl);
}
+
+ /* Activate */
+ gui_focus_change((event->modifiers) & activeFlag);
}
***************
*** 2559,2574 ****
OSErr error;
/* Handle contextual menu right now (if needed) */
! if (gui.MacOSHaveCntxMenu)
! if (IsShowContextualMenuClick(event))
! {
# if 0
! gui_mac_handle_contextual_menu(event);
# else
! gui_mac_doMouseDownEvent(event);
# endif
! return;
! }
/* Handle normal event */
switch (event->what)
--- 2553,2567 ----
OSErr error;
/* Handle contextual menu right now (if needed) */
! if (IsShowContextualMenuClick(event))
! {
# if 0
! gui_mac_handle_contextual_menu(event);
# else
! gui_mac_doMouseDownEvent(event);
# endif
! return;
! }
/* Handle normal event */
switch (event->what)
***************
*** 2782,2795 ****
(void) InstallAEHandlers();
#endif
- if (Gestalt(gestaltContextualMenuAttr, &gestalt_rc) == noErr)
- gui.MacOSHaveCntxMenu = BitTst(&gestalt_rc, 31-gestaltContextualMenuTrapAvailable);
- else
- gui.MacOSHaveCntxMenu = false;
-
- if (gui.MacOSHaveCntxMenu)
- gui.MacOSHaveCntxMenu = (InitContextualMenus()==noErr);
-
pomme = NewMenu(256, "\p\024"); /* 0x14= = Apple Menu */
AppendMenu(pomme, "\pAbout VIM");
--- 2775,2780 ----
***************
*** 2941,2946 ****
--- 2926,2932 ----
#ifdef USE_CARBONKEYHANDLER
EventHandlerRef keyEventHandlerRef;
#endif
+ ControlRef rootControl;
if (Gestalt(gestaltSystemVersion, &gMacSystemVersion) != noErr)
gMacSystemVersion = 0x1000; /* TODO: Default to minimum sensible value */
***************
*** 2954,2968 ****
(void) InstallAEHandlers();
#endif
- /* Ctrl click */
- if (Gestalt(gestaltContextualMenuAttr, &gestalt_rc) == noErr)
- gui.MacOSHaveCntxMenu = BitTst(&gestalt_rc, 31-gestaltContextualMenuTrapAvailable);
- else
- gui.MacOSHaveCntxMenu = false;
-
- if (gui.MacOSHaveCntxMenu)
- gui.MacOSHaveCntxMenu = (InitContextualMenus()==noErr);
-
pomme = NewMenu(256, "\p\024"); /* 0x14= = Apple Menu */
AppendMenu(pomme, "\pAbout VIM");
--- 2940,2945 ----
***************
*** 2981,2986 ****
--- 2958,2964 ----
gui.VimWindow = NewCWindow(nil, &windRect, "\pgVim on Macintosh", true,
zoomDocProc,
(WindowPtr)-1L, true, 0);
+ CreateRootControl(gui.VimWindow, &rootControl);
InstallReceiveHandler((DragReceiveHandlerUPP)receiveHandler,
gui.VimWindow, NULL);
SetPortWindowPort(gui.VimWindow);
*** ../vim-7.1.006/src/gui.h Thu May 10 19:18:46 2007
--- src/gui.h Sat Jun 9 14:10:34 2007
***************
*** 460,466 ****
WindowPtr VimWindow;
MenuHandle MacOSHelpMenu; /* Help menu provided by the MacOS */
int MacOSHelpItems; /* Nr of help-items supplied by MacOS */
- int MacOSHaveCntxMenu; /* Contextual menu available */
WindowPtr wid; /* Window id of text area */
int visibility; /* Is window partially/fully obscured? */
#endif
--- 460,465 ----
*** ../vim-7.1.006/src/version.c Tue Jun 19 15:40:51 2007
--- src/version.c Tue Jun 19 15:44:15 2007
***************
*** 668,669 ****
--- 668,671 ----
{ /* Add new patch number below this line */
+ /**/
+ 7,
/**/
--
When danger reared its ugly head,
He bravely turned his tail and fled
Yes, Brave Sir Robin turned about
And gallantly he chickened out
Bravely taking to his feet
He beat a very brave retreat
Bravest of the brave Sir Robin
Petrified of being dead
Soiled his pants then brave Sir Robin
Turned away and fled.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- Bram at 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 ///
--- NEW FILE 7.1.008 ---
To: vim-dev at vim.org
Subject: patch 7.1.008 (correction
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Oops, forgot the src/version.c change.
Patch 7.1.008
Problem: getfsize() returns a negative number for very big files.
Solution: Check for overflow and return -2.
Files: runtime/doc/eval.txt, src/eval.c
*** ../vim-7.1.007/runtime/doc/eval.txt Sat May 12 16:38:23 2007
--- runtime/doc/eval.txt Sat Jun 9 15:48:40 2007
***************
*** 1,4 ****
! *eval.txt* For Vim version 7.1. Last change: 2007 May 11
VIM REFERENCE MANUAL by Bram Moolenaar
--- 1,4 ----
! *eval.txt* For Vim version 7.1. Last change: 2007 Jun 09
VIM REFERENCE MANUAL by Bram Moolenaar
***************
*** 2824,2829 ****
--- 2824,2831 ----
given file {fname}.
If {fname} is a directory, 0 is returned.
If the file {fname} can't be found, -1 is returned.
+ If the size of {fname} is too big to fit in a Number then -2
+ is returned.
getfontname([{name}]) *getfontname()*
Without an argument returns the name of the normal font being
*** ../vim-7.1.007/src/eval.c Thu May 10 21:30:00 2007
--- src/eval.c Sat Jun 9 15:46:46 2007
***************
*** 10136,10142 ****
--- 10136,10148 ----
if (mch_isdir(fname))
rettv->vval.v_number = 0;
else
+ {
rettv->vval.v_number = (varnumber_T)st.st_size;
+
+ /* non-perfect check for overflow */
+ if ((off_t)rettv->vval.v_number != (off_t)st.st_size)
+ rettv->vval.v_number = -2;
+ }
}
else
rettv->vval.v_number = -1;
*** ../vim-7.1.007/src/version.c Tue Jun 19 16:33:53 2007
--- src/version.c Tue Jun 19 17:30:50 2007
***************
*** 668,669 ****
--- 668,671 ----
{ /* Add new patch number below this line */
+ /**/
+ 8,
/**/
--
ZOOT: I'm afraid our life must seem very dull and quiet compared to yours.
We are but eightscore young blondes, all between sixteen and
nineteen-and-a-half, cut off in this castle, with no one to protect us.
Oooh. It is a lonely life ... bathing ... dressing ... undressing ...
making exciting underwear....
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- Bram at 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 ///
--- NEW FILE 7.1.009 ---
To: vim-dev at vim.org
Subject: patch 7.1.009
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.1.009
Problem: In diff mode, displaying the difference between a tab and spaces
is not highlighted correctly.
Solution: Only change highlighting at the end of displaying a tab.
Files: src/screen.c
*** ../vim-7.1.008/src/screen.c Thu May 10 20:15:31 2007
--- src/screen.c Mon Jun 11 21:49:44 2007
***************
*** 3459,3467 ****
#ifdef FEAT_DIFF
if (diff_hlf != (hlf_T)0)
{
! if (diff_hlf == HLF_CHD && ptr - line >= change_start)
diff_hlf = HLF_TXD; /* changed text */
! if (diff_hlf == HLF_TXD && ptr - line > change_end)
diff_hlf = HLF_CHD; /* changed line */
line_attr = hl_attr(diff_hlf);
}
--- 3459,3469 ----
#ifdef FEAT_DIFF
if (diff_hlf != (hlf_T)0)
{
! if (diff_hlf == HLF_CHD && ptr - line >= change_start
! && n_extra == 0)
diff_hlf = HLF_TXD; /* changed text */
! if (diff_hlf == HLF_TXD && ptr - line > change_end
! && n_extra == 0)
diff_hlf = HLF_CHD; /* changed line */
line_attr = hl_attr(diff_hlf);
}
*** ../vim-7.1.008/src/version.c Tue Jun 19 17:33:52 2007
--- src/version.c Tue Jun 19 17:36:36 2007
***************
*** 668,669 ****
--- 668,671 ----
{ /* Add new patch number below this line */
+ /**/
+ 9,
/**/
--
Linux is just like a wigwam: no Windows, no Gates and an Apache inside.
/// Bram Moolenaar -- Bram at 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 ///
--- NEW FILE 7.1.010 ---
To: vim-dev at vim.org
Subject: patch 7.1.010
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.1.010
Problem: The Gnome session file doesn't restore tab pages.
Solution: Add SSOP_TABPAGES to the session flags. (Matias D'Ambrosio)
Files: src/gui_gtk_x11.c
*** ../vim-7.1.009/src/gui_gtk_x11.c Mon May 14 19:35:51 2007
--- src/gui_gtk_x11.c Sat Jun 9 16:54:13 2007
***************
*** 2188,2195 ****
escaped_filename = vim_strsave_escaped(filename, escape_chars);
if (escaped_filename == NULL)
return FALSE;
! mksession_cmdline = g_strconcat("mksession ", (char *)escaped_filename, NULL);
vim_free(escaped_filename);
/*
* Use a reasonable hardcoded set of 'sessionoptions' flags to avoid
* unpredictable effects when the session is saved automatically. Also,
--- 2188,2197 ----
escaped_filename = vim_strsave_escaped(filename, escape_chars);
if (escaped_filename == NULL)
return FALSE;
! mksession_cmdline = g_strconcat("mksession ", (char *)escaped_filename,
! NULL);
vim_free(escaped_filename);
+
/*
* Use a reasonable hardcoded set of 'sessionoptions' flags to avoid
* unpredictable effects when the session is saved automatically. Also,
***************
*** 2199,2205 ****
*/
save_ssop_flags = ssop_flags;
ssop_flags = (SSOP_BLANK|SSOP_CURDIR|SSOP_FOLDS|SSOP_GLOBALS
! |SSOP_HELP|SSOP_OPTIONS|SSOP_WINSIZE);
do_cmdline_cmd((char_u *)"let Save_VV_this_session = v:this_session");
failed = (do_cmdline_cmd((char_u *)mksession_cmdline) == FAIL);
--- 2201,2207 ----
*/
save_ssop_flags = ssop_flags;
ssop_flags = (SSOP_BLANK|SSOP_CURDIR|SSOP_FOLDS|SSOP_GLOBALS
! |SSOP_HELP|SSOP_OPTIONS|SSOP_WINSIZE|SSOP_TABPAGES);
do_cmdline_cmd((char_u *)"let Save_VV_this_session = v:this_session");
failed = (do_cmdline_cmd((char_u *)mksession_cmdline) == FAIL);
*** ../vim-7.1.009/src/version.c Tue Jun 19 17:49:12 2007
--- src/version.c Tue Jun 19 18:07:09 2007
***************
*** 668,669 ****
--- 668,671 ----
{ /* Add new patch number below this line */
+ /**/
+ 10,
/**/
--
GALAHAD: No look, really, this isn't nescess ...
PIGLET: We must examine you.
GALAHAD: There's nothing wrong with ... that.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- Bram at 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 ///
--- NEW FILE 7.1.011 ---
To: vim-dev at vim.org
Subject: patch 7.1.011
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.1.011
Problem: Possible buffer overflow when $VIMRUNTIME is very long. (Victor
Stinner)
Solution: Use vim_snprintf().
Files: src/main.c
*** ../vim-7.1.010/src/main.c Thu May 10 21:12:25 2007
--- src/main.c Sat Jun 9 22:37:46 2007
***************
*** 1360,1367 ****
p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree);
if (p != NULL && *p != NUL)
{
! STRCPY(NameBuff, p);
! STRCAT(NameBuff, "/lang");
bindtextdomain(VIMPACKAGE, (char *)NameBuff);
}
if (mustfree)
--- 1360,1366 ----
p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree);
if (p != NULL && *p != NUL)
{
! vim_snprintf((char *)NameBuff, MAXPATHL, "%s/lang", p);
bindtextdomain(VIMPACKAGE, (char *)NameBuff);
}
if (mustfree)
*** ../vim-7.1.010/src/version.c Tue Jun 19 18:07:52 2007
--- src/version.c Tue Jun 19 20:29:44 2007
***************
*** 668,669 ****
--- 668,671 ----
{ /* Add new patch number below this line */
+ /**/
+ 11,
/**/
--
GALAHAD hurries to the door and pushes through it. As he leaves the room
we CUT TO the reverse to show that he is now in a room full of bathing
and romping GIRLIES, all innocent, wide-eyed and beautiful. They smile
enchantingly at him as he tries to keep walking without being diverted by
the lovely sights assaulting his eyeballs.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- Bram at 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 ///
--- NEW FILE 7.1.012 ---
To: vim-dev at vim.org
Subject: patch 7.1.012
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.1.012
Problem: ":let &shiftwidth = 'asdf'" doesn't produce an error message.
Solution: Check for a string argument. (Chris Lubinski)
Files: src/option.c
*** ../vim-7.1.011/src/option.c Sun May 6 15:37:32 2007
--- src/option.c Tue Jun 19 20:56:36 2007
***************
*** 8219,8224 ****
--- 8219,8243 ----
varp = get_varp(&options[opt_idx]);
if (varp != NULL) /* hidden option is not changed */
{
+ if (number == 0 && string != NULL)
+ {
+ int index;
+
+ /* Either we are given a string or we are setting option
+ * to zero. */
+ for (index = 0; string[index] == '0'; ++index)
+ ;
+ if (string[index] != NUL || index == 0)
+ {
+ /* There's another character after zeros or the string
+ * is empty. In both cases, we are trying to set a
+ * num option using a string. */
+ EMSG3(_("E521: Number required: &%s = '%s'"),
+ name, string);
+ return; /* do nothing as we hit an error */
+
+ }
+ }
if (flags & P_NUM)
(void)set_num_option(opt_idx, varp, number,
NULL, 0, opt_flags);
*** ../vim-7.1.011/src/version.c Tue Jun 19 20:30:46 2007
--- src/version.c Tue Jun 19 20:53:15 2007
***************
*** 668,669 ****
--- 668,671 ----
{ /* Add new patch number below this line */
+ /**/
+ 12,
/**/
--
Ten million Linux users can't be wrong!
/// Bram Moolenaar -- Bram at 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 ///
Index: README.patches
===================================================================
RCS file: /cvs/extras/rpms/vim/F-7/README.patches,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- README.patches 5 Jun 2007 13:49:11 -0000 1.77
+++ README.patches 27 Jun 2007 08:36:06 -0000 1.78
@@ -27,3 +27,13 @@
SIZE NAME FIXES
2404 7.1.001 can't build with Gnome GUI
2011 7.1.002 Oracle Pro*C/C++ files are not detected
+ 1529 7.1.003 (extra) Win32: menu entries end up in message history
+ 2481 7.1.004 crash when editing a directory
+ 3841 7.1.005 "cit" used on <foo></foo> deletes <foo>
+ 2941 7.1.006 when reading from stdin 'modified' can't be reset in autocmd
+ 6458 7.1.007 (extra) Mac: context menu does not work, scrollbars not dimmed
+ 2631 7.1.008 getfsize() returns an invalid number for very big files
+ 1881 7.1.009 diff mode: tab to spaces change not highlighted correctly
+ 2796 7.1.010 Gnome: tab pages are not included in the saved session
+ 1934 7.1.011 buffer overflow when $VIMRUNTIME is very long
+ 1904 7.1.012 ":let &tw = 'asdf'" does not give an error message
Index: vim.spec
===================================================================
RCS file: /cvs/extras/rpms/vim/F-7/vim.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- vim.spec 5 Jun 2007 13:49:11 -0000 1.167
+++ vim.spec 27 Jun 2007 08:36:06 -0000 1.168
@@ -15,7 +15,7 @@
#used for pre-releases:
%define beta %{nil}
%define vimdir vim71%{?beta}
-%define patchlevel 2
+%define patchlevel 12
Summary: The VIM editor
URL: http://www.vim.org/
@@ -53,6 +53,16 @@
# for i in `seq 1 14`; do printf "Patch%03d: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.%03d\n" $i $i; done
Patch001: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.001
Patch002: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.002
+# Win32: Patch003: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.003
+Patch004: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.004
+Patch005: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.005
+Patch006: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.006
+#Mac: Patch007: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.007
+Patch008: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.008
+Patch009: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.009
+Patch010: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.010
+Patch011: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.011
+Patch012: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.012
Patch3000: vim-7.0-syntax.patch
Patch3002: vim-7.1-nowarnings.patch
@@ -187,6 +197,16 @@
# for i in `seq 1 14`; do printf "%%patch%03d -p0 \n" $i; done
%patch001 -p0
%patch002 -p0
+#Win 32: patch003 -p0
+%patch004 -p0
+%patch005 -p0
+%patch006 -p0
+#Mac: patch007 -p0
+%patch008 -p0
+%patch009 -p0
+%patch010 -p0
+%patch011 -p0
+%patch012 -p0
# install spell files
%if %{withvimspell}
@@ -572,7 +592,10 @@
%{_datadir}/icons/hicolor/*/apps/*
%changelog
-* Mon Jun 04 2007 Karsten Hopp <karsten at redhat.com> 7.1.%{nil}2-1
+* Wed Jun 27 2007 Karsten Hopp <karsten at redhat.com> 7.1.12-1
+- Patchlevel 12
+
+* Mon Jun 04 2007 Karsten Hopp <karsten at redhat.com> 7.1.2-1
- vim 7.1
- drop 240 patches
More information about the fedora-extras-commits
mailing list