|
 |
52b0ca0 |
To: vim_dev@googlegroups.com
|
|
|
52b0ca0 |
Subject: Patch 7.3.048
|
|
|
52b0ca0 |
Fcc: outbox
|
|
|
52b0ca0 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
52b0ca0 |
Mime-Version: 1.0
|
|
|
52b0ca0 |
Content-Type: text/plain; charset=UTF-8
|
|
|
52b0ca0 |
Content-Transfer-Encoding: 8bit
|
|
|
52b0ca0 |
------------
|
|
|
52b0ca0 |
|
|
|
52b0ca0 |
Patch 7.3.048
|
|
|
52b0ca0 |
Problem: ":earlier 1f" doesn't work after loading undo file.
|
|
|
52b0ca0 |
Solution: Set b_u_save_nr_cur when loading an undo file. (Christian
|
|
|
52b0ca0 |
Brabandt)
|
|
|
52b0ca0 |
Fix only showing time in ":undolist"
|
|
|
52b0ca0 |
Files: src/undo.c
|
|
|
52b0ca0 |
|
|
|
52b0ca0 |
|
|
|
52b0ca0 |
*** ../vim-7.3.047/src/undo.c 2010-08-15 21:57:28.000000000 +0200
|
|
|
52b0ca0 |
--- src/undo.c 2010-11-03 19:26:38.000000000 +0100
|
|
|
52b0ca0 |
***************
|
|
|
52b0ca0 |
*** 1861,1866 ****
|
|
|
52b0ca0 |
--- 1861,1867 ----
|
|
|
52b0ca0 |
curbuf->b_u_seq_cur = seq_cur;
|
|
|
52b0ca0 |
curbuf->b_u_time_cur = seq_time;
|
|
|
52b0ca0 |
curbuf->b_u_save_nr_last = last_save_nr;
|
|
|
52b0ca0 |
+ curbuf->b_u_save_nr_cur = last_save_nr;
|
|
|
52b0ca0 |
|
|
|
52b0ca0 |
curbuf->b_u_synced = TRUE;
|
|
|
52b0ca0 |
vim_free(uhp_table);
|
|
|
52b0ca0 |
***************
|
|
|
52b0ca0 |
*** 2794,2800 ****
|
|
|
52b0ca0 |
uhp->uh_time);
|
|
|
52b0ca0 |
if (uhp->uh_save_nr > 0)
|
|
|
52b0ca0 |
{
|
|
|
52b0ca0 |
! while (STRLEN(IObuff) < 32)
|
|
|
52b0ca0 |
STRCAT(IObuff, " ");
|
|
|
52b0ca0 |
vim_snprintf_add((char *)IObuff, IOSIZE,
|
|
|
52b0ca0 |
" %3ld", uhp->uh_save_nr);
|
|
|
52b0ca0 |
--- 2795,2801 ----
|
|
|
52b0ca0 |
uhp->uh_time);
|
|
|
52b0ca0 |
if (uhp->uh_save_nr > 0)
|
|
|
52b0ca0 |
{
|
|
|
52b0ca0 |
! while (STRLEN(IObuff) < 33)
|
|
|
52b0ca0 |
STRCAT(IObuff, " ");
|
|
|
52b0ca0 |
vim_snprintf_add((char *)IObuff, IOSIZE,
|
|
|
52b0ca0 |
" %3ld", uhp->uh_save_nr);
|
|
|
52b0ca0 |
***************
|
|
|
52b0ca0 |
*** 2849,2855 ****
|
|
|
52b0ca0 |
sort_strings((char_u **)ga.ga_data, ga.ga_len);
|
|
|
52b0ca0 |
|
|
|
52b0ca0 |
msg_start();
|
|
|
52b0ca0 |
! msg_puts_attr((char_u *)_("number changes time saved"),
|
|
|
52b0ca0 |
hl_attr(HLF_T));
|
|
|
52b0ca0 |
for (i = 0; i < ga.ga_len && !got_int; ++i)
|
|
|
52b0ca0 |
{
|
|
|
52b0ca0 |
--- 2850,2856 ----
|
|
|
52b0ca0 |
sort_strings((char_u **)ga.ga_data, ga.ga_len);
|
|
|
52b0ca0 |
|
|
|
52b0ca0 |
msg_start();
|
|
|
52b0ca0 |
! msg_puts_attr((char_u *)_("number changes when saved"),
|
|
|
52b0ca0 |
hl_attr(HLF_T));
|
|
|
52b0ca0 |
for (i = 0; i < ga.ga_len && !got_int; ++i)
|
|
|
52b0ca0 |
{
|
|
|
52b0ca0 |
***************
|
|
|
52b0ca0 |
*** 2879,2885 ****
|
|
|
52b0ca0 |
if (time(NULL) - tt >= 100)
|
|
|
52b0ca0 |
{
|
|
|
52b0ca0 |
curtime = localtime(&tt;;
|
|
|
52b0ca0 |
! (void)strftime((char *)buf, buflen, "%H:%M:%S", curtime);
|
|
|
52b0ca0 |
}
|
|
|
52b0ca0 |
else
|
|
|
52b0ca0 |
#endif
|
|
|
52b0ca0 |
--- 2880,2894 ----
|
|
|
52b0ca0 |
if (time(NULL) - tt >= 100)
|
|
|
52b0ca0 |
{
|
|
|
52b0ca0 |
curtime = localtime(&tt;;
|
|
|
52b0ca0 |
! if (time(NULL) - tt < (60L * 60L * 12L))
|
|
|
52b0ca0 |
! /* within 12 hours */
|
|
|
52b0ca0 |
! (void)strftime((char *)buf, buflen, "%H:%M:%S", curtime);
|
|
|
52b0ca0 |
! else if (time(NULL) - tt < (60L * 60L * 24L * 180L))
|
|
|
52b0ca0 |
! /* within 6 months */
|
|
|
52b0ca0 |
! (void)strftime((char *)buf, buflen, "%m/%d %H:%M:%S", curtime);
|
|
|
52b0ca0 |
! else
|
|
|
52b0ca0 |
! /* long ago */
|
|
|
52b0ca0 |
! (void)strftime((char *)buf, buflen, "%y/%m/%d %H:%M:%S", curtime);
|
|
|
52b0ca0 |
}
|
|
|
52b0ca0 |
else
|
|
|
52b0ca0 |
#endif
|
|
|
52b0ca0 |
*** ../vim-7.3.047/src/version.c 2010-10-27 18:36:32.000000000 +0200
|
|
|
52b0ca0 |
--- src/version.c 2010-11-03 19:27:07.000000000 +0100
|
|
|
52b0ca0 |
***************
|
|
|
52b0ca0 |
*** 716,717 ****
|
|
|
52b0ca0 |
--- 716,719 ----
|
|
|
52b0ca0 |
{ /* Add new patch number below this line */
|
|
|
52b0ca0 |
+ /**/
|
|
|
52b0ca0 |
+ 48,
|
|
|
52b0ca0 |
/**/
|
|
|
52b0ca0 |
|
|
|
52b0ca0 |
--
|
|
|
52b0ca0 |
TIM: To the north there lies a cave, the cave of Caerbannog, wherein, carved
|
|
|
52b0ca0 |
in mystic runes, upon the very living rock, the last words of Olfin
|
|
|
52b0ca0 |
Bedwere of Rheged make plain the last resting place of the most Holy
|
|
|
52b0ca0 |
Grail.
|
|
|
52b0ca0 |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
52b0ca0 |
|
|
|
52b0ca0 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
52b0ca0 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
52b0ca0 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
52b0ca0 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|