projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 43e41de9 ER |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.077 | |
| 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.077 | |
| 11 | Problem: When updating crypt of swapfile fails there is no error message. | |
| 12 | (Carlo Teubner) | |
| 13 | Solution: Add the error message. | |
| 14 | Files: src/memline.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.3.076/src/memline.c 2010-08-15 21:57:31.000000000 +0200 | |
| 18 | --- src/memline.c 2010-12-08 12:39:10.000000000 +0100 | |
| 19 | *************** | |
| 20 | *** 582,587 **** | |
| 21 | --- 582,590 ---- | |
| 22 | idx = ip->ip_index + 1; /* go to next index */ | |
| 23 | page_count = 1; | |
| 24 | } | |
| 25 | + | |
| 26 | + if (error > 0) | |
| 27 | + EMSG(_("E843: Error while updating swap file crypt")); | |
| 28 | } | |
| 29 | ||
| 30 | mfp->mf_old_key = NULL; | |
| 31 | *************** | |
| 32 | *** 2384,2390 **** | |
| 33 | * Make a copy of the line if necessary. | |
| 34 | */ | |
| 35 | /* | |
| 36 | ! * get a pointer to a (read-only copy of a) line | |
| 37 | * | |
| 38 | * On failure an error message is given and IObuff is returned (to avoid | |
| 39 | * having to check for error everywhere). | |
| 40 | --- 2387,2393 ---- | |
| 41 | * Make a copy of the line if necessary. | |
| 42 | */ | |
| 43 | /* | |
| 44 | ! * Return a pointer to a (read-only copy of a) line. | |
| 45 | * | |
| 46 | * On failure an error message is given and IObuff is returned (to avoid | |
| 47 | * having to check for error everywhere). | |
| 48 | *************** | |
| 49 | *** 2397,2403 **** | |
| 50 | } | |
| 51 | ||
| 52 | /* | |
| 53 | ! * ml_get_pos: get pointer to position 'pos' | |
| 54 | */ | |
| 55 | char_u * | |
| 56 | ml_get_pos(pos) | |
| 57 | --- 2400,2406 ---- | |
| 58 | } | |
| 59 | ||
| 60 | /* | |
| 61 | ! * Return pointer to position "pos". | |
| 62 | */ | |
| 63 | char_u * | |
| 64 | ml_get_pos(pos) | |
| 65 | *************** | |
| 66 | *** 2407,2413 **** | |
| 67 | } | |
| 68 | ||
| 69 | /* | |
| 70 | ! * ml_get_curline: get pointer to cursor line. | |
| 71 | */ | |
| 72 | char_u * | |
| 73 | ml_get_curline() | |
| 74 | --- 2410,2416 ---- | |
| 75 | } | |
| 76 | ||
| 77 | /* | |
| 78 | ! * Return pointer to cursor line. | |
| 79 | */ | |
| 80 | char_u * | |
| 81 | ml_get_curline() | |
| 82 | *************** | |
| 83 | *** 2416,2422 **** | |
| 84 | } | |
| 85 | ||
| 86 | /* | |
| 87 | ! * ml_get_cursor: get pointer to cursor position | |
| 88 | */ | |
| 89 | char_u * | |
| 90 | ml_get_cursor() | |
| 91 | --- 2419,2425 ---- | |
| 92 | } | |
| 93 | ||
| 94 | /* | |
| 95 | ! * Return pointer to cursor position. | |
| 96 | */ | |
| 97 | char_u * | |
| 98 | ml_get_cursor() | |
| 99 | *************** | |
| 100 | *** 2426,2432 **** | |
| 101 | } | |
| 102 | ||
| 103 | /* | |
| 104 | ! * get a pointer to a line in a specific buffer | |
| 105 | * | |
| 106 | * "will_change": if TRUE mark the buffer dirty (chars in the line will be | |
| 107 | * changed) | |
| 108 | --- 2429,2435 ---- | |
| 109 | } | |
| 110 | ||
| 111 | /* | |
| 112 | ! * Return a pointer to a line in a specific buffer | |
| 113 | * | |
| 114 | * "will_change": if TRUE mark the buffer dirty (chars in the line will be | |
| 115 | * changed) | |
| 116 | *** ../vim-7.3.076/src/version.c 2010-12-08 13:11:15.000000000 +0100 | |
| 117 | --- src/version.c 2010-12-08 13:15:44.000000000 +0100 | |
| 118 | *************** | |
| 119 | *** 716,717 **** | |
| 120 | --- 716,719 ---- | |
| 121 | { /* Add new patch number below this line */ | |
| 122 | + /**/ | |
| 123 | + 77, | |
| 124 | /**/ | |
| 125 | ||
| 126 | -- | |
| 127 | An operatingsystem is just a name you give to the rest of bloating | |
| 128 | idiosyncratic machine-based-features you left out of your editor. | |
| 129 | (author unknown) | |
| 130 | ||
| 131 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 132 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 133 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 134 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |