projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 73a2f53a ER |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.048 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.048 | |
| 11 | Problem: ":earlier 1f" doesn't work after loading undo file. | |
| 12 | Solution: Set b_u_save_nr_cur when loading an undo file. (Christian | |
| 13 | Brabandt) | |
| 14 | Fix only showing time in ":undolist" | |
| 15 | Files: src/undo.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.3.047/src/undo.c 2010-08-15 21:57:28.000000000 +0200 | |
| 19 | --- src/undo.c 2010-11-03 19:26:38.000000000 +0100 | |
| 20 | *************** | |
| 21 | *** 1861,1866 **** | |
| 22 | --- 1861,1867 ---- | |
| 23 | curbuf->b_u_seq_cur = seq_cur; | |
| 24 | curbuf->b_u_time_cur = seq_time; | |
| 25 | curbuf->b_u_save_nr_last = last_save_nr; | |
| 26 | + curbuf->b_u_save_nr_cur = last_save_nr; | |
| 27 | ||
| 28 | curbuf->b_u_synced = TRUE; | |
| 29 | vim_free(uhp_table); | |
| 30 | *************** | |
| 31 | *** 2794,2800 **** | |
| 32 | uhp->uh_time); | |
| 33 | if (uhp->uh_save_nr > 0) | |
| 34 | { | |
| 35 | ! while (STRLEN(IObuff) < 32) | |
| 36 | STRCAT(IObuff, " "); | |
| 37 | vim_snprintf_add((char *)IObuff, IOSIZE, | |
| 38 | " %3ld", uhp->uh_save_nr); | |
| 39 | --- 2795,2801 ---- | |
| 40 | uhp->uh_time); | |
| 41 | if (uhp->uh_save_nr > 0) | |
| 42 | { | |
| 43 | ! while (STRLEN(IObuff) < 33) | |
| 44 | STRCAT(IObuff, " "); | |
| 45 | vim_snprintf_add((char *)IObuff, IOSIZE, | |
| 46 | " %3ld", uhp->uh_save_nr); | |
| 47 | *************** | |
| 48 | *** 2849,2855 **** | |
| 49 | sort_strings((char_u **)ga.ga_data, ga.ga_len); | |
| 50 | ||
| 51 | msg_start(); | |
| 52 | ! msg_puts_attr((char_u *)_("number changes time saved"), | |
| 53 | hl_attr(HLF_T)); | |
| 54 | for (i = 0; i < ga.ga_len && !got_int; ++i) | |
| 55 | { | |
| 56 | --- 2850,2856 ---- | |
| 57 | sort_strings((char_u **)ga.ga_data, ga.ga_len); | |
| 58 | ||
| 59 | msg_start(); | |
| 60 | ! msg_puts_attr((char_u *)_("number changes when saved"), | |
| 61 | hl_attr(HLF_T)); | |
| 62 | for (i = 0; i < ga.ga_len && !got_int; ++i) | |
| 63 | { | |
| 64 | *************** | |
| 65 | *** 2879,2885 **** | |
| 66 | if (time(NULL) - tt >= 100) | |
| 67 | { | |
| 68 | curtime = localtime(&tt); | |
| 69 | ! (void)strftime((char *)buf, buflen, "%H:%M:%S", curtime); | |
| 70 | } | |
| 71 | else | |
| 72 | #endif | |
| 73 | --- 2880,2894 ---- | |
| 74 | if (time(NULL) - tt >= 100) | |
| 75 | { | |
| 76 | curtime = localtime(&tt); | |
| 77 | ! if (time(NULL) - tt < (60L * 60L * 12L)) | |
| 78 | ! /* within 12 hours */ | |
| 79 | ! (void)strftime((char *)buf, buflen, "%H:%M:%S", curtime); | |
| 80 | ! else if (time(NULL) - tt < (60L * 60L * 24L * 180L)) | |
| 81 | ! /* within 6 months */ | |
| 82 | ! (void)strftime((char *)buf, buflen, "%m/%d %H:%M:%S", curtime); | |
| 83 | ! else | |
| 84 | ! /* long ago */ | |
| 85 | ! (void)strftime((char *)buf, buflen, "%y/%m/%d %H:%M:%S", curtime); | |
| 86 | } | |
| 87 | else | |
| 88 | #endif | |
| 89 | *** ../vim-7.3.047/src/version.c 2010-10-27 18:36:32.000000000 +0200 | |
| 90 | --- src/version.c 2010-11-03 19:27:07.000000000 +0100 | |
| 91 | *************** | |
| 92 | *** 716,717 **** | |
| 93 | --- 716,719 ---- | |
| 94 | { /* Add new patch number below this line */ | |
| 95 | + /**/ | |
| 96 | + 48, | |
| 97 | /**/ | |
| 98 | ||
| 99 | -- | |
| 100 | TIM: To the north there lies a cave, the cave of Caerbannog, wherein, carved | |
| 101 | in mystic runes, upon the very living rock, the last words of Olfin | |
| 102 | Bedwere of Rheged make plain the last resting place of the most Holy | |
| 103 | Grail. | |
| 104 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
| 105 | ||
| 106 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 107 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 108 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 109 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |