projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| c84df032 ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.0.159 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.0.159 | |
| 11 | Problem: When there is an I/O error in the swap file the cause of the error | |
| 12 | cannot be seen. | |
| 13 | Solution: Use PERROR() instead of EMSG() where possible. | |
| 14 | Files: src/memfile.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.0.158/src/memfile.c Wed Nov 1 18:10:36 2006 | |
| 18 | --- src/memfile.c Wed Nov 1 21:38:59 2006 | |
| 19 | *************** | |
| 20 | *** 1028,1039 **** | |
| 21 | size = page_size * hp->bh_page_count; | |
| 22 | if (lseek(mfp->mf_fd, offset, SEEK_SET) != offset) | |
| 23 | { | |
| 24 | ! EMSG(_("E294: Seek error in swap file read")); | |
| 25 | return FAIL; | |
| 26 | } | |
| 27 | if ((unsigned)vim_read(mfp->mf_fd, hp->bh_data, size) != size) | |
| 28 | { | |
| 29 | ! EMSG(_("E295: Read error in swap file")); | |
| 30 | return FAIL; | |
| 31 | } | |
| 32 | return OK; | |
| 33 | --- 1028,1039 ---- | |
| 34 | size = page_size * hp->bh_page_count; | |
| 35 | if (lseek(mfp->mf_fd, offset, SEEK_SET) != offset) | |
| 36 | { | |
| 37 | ! PERROR(_("E294: Seek error in swap file read")); | |
| 38 | return FAIL; | |
| 39 | } | |
| 40 | if ((unsigned)vim_read(mfp->mf_fd, hp->bh_data, size) != size) | |
| 41 | { | |
| 42 | ! PERROR(_("E295: Read error in swap file")); | |
| 43 | return FAIL; | |
| 44 | } | |
| 45 | return OK; | |
| 46 | *************** | |
| 47 | *** 1085,1091 **** | |
| 48 | offset = (off_t)page_size * nr; | |
| 49 | if (lseek(mfp->mf_fd, offset, SEEK_SET) != offset) | |
| 50 | { | |
| 51 | ! EMSG(_("E296: Seek error in swap file write")); | |
| 52 | return FAIL; | |
| 53 | } | |
| 54 | if (hp2 == NULL) /* freed block, fill with dummy data */ | |
| 55 | --- 1085,1091 ---- | |
| 56 | offset = (off_t)page_size * nr; | |
| 57 | if (lseek(mfp->mf_fd, offset, SEEK_SET) != offset) | |
| 58 | { | |
| 59 | ! PERROR(_("E296: Seek error in swap file write")); | |
| 60 | return FAIL; | |
| 61 | } | |
| 62 | if (hp2 == NULL) /* freed block, fill with dummy data */ | |
| 63 | *** ../vim-7.0.158/src/version.c Wed Nov 1 21:24:58 2006 | |
| 64 | --- src/version.c Tue Nov 7 17:58:58 2006 | |
| 65 | *************** | |
| 66 | *** 668,669 **** | |
| 67 | --- 668,671 ---- | |
| 68 | { /* Add new patch number below this line */ | |
| 69 | + /**/ | |
| 70 | + 159, | |
| 71 | /**/ | |
| 72 | ||
| 73 | -- | |
| 74 | hundred-and-one symptoms of being an internet addict: | |
| 75 | 171. You invent another person and chat with yourself in empty chat rooms. | |
| 76 | ||
| 77 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 78 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 79 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 80 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |