- patchlevel 441
This commit is contained in:
Karsten Hopp
parent
ffaccd131f
commit
fece86dcf1
141
7.2.441
Normal file
141
7.2.441
Normal file
@ -0,0 +1,141 @@
|
||||
To: vim-dev@vim.org
|
||||
Subject: Patch 7.2.441
|
||||
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.441
|
||||
Problem: When using ":earlier" undo information may be wrong.
|
||||
Solution: When changing alternate branches also adjust b_u_oldhead.
|
||||
Files: src/undo.c
|
||||
|
||||
|
||||
*** ../vim-7.2.440/src/undo.c 2008-02-13 15:21:29.000000000 +0100
|
||||
--- src/undo.c 2010-05-30 16:52:47.000000000 +0200
|
||||
***************
|
||||
*** 242,248 ****
|
||||
}
|
||||
|
||||
/*
|
||||
! * save the line "lnum" (used by ":s" and "~" command)
|
||||
* The line is replaced, so the new bottom line is lnum + 1.
|
||||
*/
|
||||
int
|
||||
--- 242,248 ----
|
||||
}
|
||||
|
||||
/*
|
||||
! * Save the line "lnum" (used by ":s" and "~" command).
|
||||
* The line is replaced, so the new bottom line is lnum + 1.
|
||||
*/
|
||||
int
|
||||
***************
|
||||
*** 256,262 ****
|
||||
}
|
||||
|
||||
/*
|
||||
! * a new line is inserted before line "lnum" (used by :s command)
|
||||
* The line is inserted, so the new bottom line is lnum + 1.
|
||||
*/
|
||||
int
|
||||
--- 256,262 ----
|
||||
}
|
||||
|
||||
/*
|
||||
! * A new line is inserted before line "lnum" (used by :s command).
|
||||
* The line is inserted, so the new bottom line is lnum + 1.
|
||||
*/
|
||||
int
|
||||
***************
|
||||
*** 270,276 ****
|
||||
}
|
||||
|
||||
/*
|
||||
! * save the lines "lnum" - "lnum" + nlines (used by delete command)
|
||||
* The lines are deleted, so the new bottom line is lnum, unless the buffer
|
||||
* becomes empty.
|
||||
*/
|
||||
--- 270,276 ----
|
||||
}
|
||||
|
||||
/*
|
||||
! * Save the lines "lnum" - "lnum" + nlines (used by delete command).
|
||||
* The lines are deleted, so the new bottom line is lnum, unless the buffer
|
||||
* becomes empty.
|
||||
*/
|
||||
***************
|
||||
*** 996,1001 ****
|
||||
--- 996,1003 ----
|
||||
last->uh_alt_next = uhp;
|
||||
uhp->uh_alt_prev = last;
|
||||
|
||||
+ if (curbuf->b_u_oldhead == uhp)
|
||||
+ curbuf->b_u_oldhead = last;
|
||||
uhp = last;
|
||||
if (uhp->uh_next != NULL)
|
||||
uhp->uh_next->uh_prev = uhp;
|
||||
***************
|
||||
*** 1406,1415 ****
|
||||
/*
|
||||
* ":undolist": List the leafs of the undo tree
|
||||
*/
|
||||
- /*ARGSUSED*/
|
||||
void
|
||||
ex_undolist(eap)
|
||||
! exarg_T *eap;
|
||||
{
|
||||
garray_T ga;
|
||||
u_header_T *uhp;
|
||||
--- 1408,1416 ----
|
||||
/*
|
||||
* ":undolist": List the leafs of the undo tree
|
||||
*/
|
||||
void
|
||||
ex_undolist(eap)
|
||||
! exarg_T *eap UNUSED;
|
||||
{
|
||||
garray_T ga;
|
||||
u_header_T *uhp;
|
||||
***************
|
||||
*** 1529,1538 ****
|
||||
/*
|
||||
* ":undojoin": continue adding to the last entry list
|
||||
*/
|
||||
- /*ARGSUSED*/
|
||||
void
|
||||
ex_undojoin(eap)
|
||||
! exarg_T *eap;
|
||||
{
|
||||
if (curbuf->b_u_newhead == NULL)
|
||||
return; /* nothing changed before */
|
||||
--- 1530,1538 ----
|
||||
/*
|
||||
* ":undojoin": continue adding to the last entry list
|
||||
*/
|
||||
void
|
||||
ex_undojoin(eap)
|
||||
! exarg_T *eap UNUSED;
|
||||
{
|
||||
if (curbuf->b_u_newhead == NULL)
|
||||
return; /* nothing changed before */
|
||||
*** ../vim-7.2.440/src/version.c 2010-05-28 22:06:41.000000000 +0200
|
||||
--- src/version.c 2010-05-30 16:53:56.000000000 +0200
|
||||
***************
|
||||
*** 683,684 ****
|
||||
--- 683,686 ----
|
||||
{ /* Add new patch number below this line */
|
||||
+ /**/
|
||||
+ 441,
|
||||
/**/
|
||||
|
||||
--
|
||||
hundred-and-one symptoms of being an internet addict:
|
||||
127. You bring your laptop and cellular phone to church.
|
||||
|
||||
/// 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 ///
|
||||
@ -472,3 +472,4 @@ Individual patches for Vim 7.2:
|
||||
2045 7.2.438 (after 7.2.427) "vim -r" crashes
|
||||
3110 7.2.439 invalid memory access for thesaurus completion and 'infercase'
|
||||
5861 7.2.440 crash when deleting a funcref in the function it refers to
|
||||
3446 7.2.441 when using ":earlier" undo information may be wrong
|
||||
|
||||
7
vim.spec
7
vim.spec
@ -18,7 +18,7 @@
|
||||
#used for pre-releases:
|
||||
%define beta %{nil}
|
||||
%define vimdir vim72%{?beta}
|
||||
%define patchlevel 440
|
||||
%define patchlevel 441
|
||||
|
||||
Summary: The VIM editor
|
||||
URL: http://www.vim.org/
|
||||
@ -506,6 +506,7 @@ Patch437: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.437
|
||||
Patch438: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.438
|
||||
Patch439: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.439
|
||||
Patch440: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.440
|
||||
Patch441: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.441
|
||||
|
||||
Patch3000: vim-7.0-syntax.patch
|
||||
Patch3002: vim-7.1-nowarnings.patch
|
||||
@ -1084,6 +1085,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
|
||||
%patch438 -p0
|
||||
%patch439 -p0
|
||||
%patch440 -p0
|
||||
%patch441 -p0
|
||||
|
||||
|
||||
# install spell files
|
||||
@ -1548,6 +1550,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/icons/hicolor/*/apps/*
|
||||
|
||||
%changelog
|
||||
* Sun May 30 2010 Karsten Hopp <karsten@redhat.com> 7.2.441-1
|
||||
- patchlevel 441
|
||||
|
||||
* Sat May 29 2010 Karsten Hopp <karsten@redhat.com> 7.2.440-1
|
||||
- patchlevel 440
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user