diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-12-08 13:17:03 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-12-08 13:17:03 +0100 |
| commit | 2e2e13ca14518b7788909d61a853205e8b12b176 (patch) | |
| tree | 6e8d259ca2b9f8202871ed3a1776632d9208e6c6 | |
| parent | e980d8a934393c4da5ff0d5ece6f3e158fa98306 (diff) | |
| download | vim-git-2e2e13ca14518b7788909d61a853205e8b12b176.tar.gz | |
updated for version 7.3.077v7.3.077
Problem: When updating crypt of swapfile fails there is no error message.
(Carlo Teubner)
Solution: Add the error message.
| -rw-r--r-- | src/memline.c | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/memline.c b/src/memline.c index 136f80508..e4e5bad35 100644 --- a/src/memline.c +++ b/src/memline.c @@ -582,6 +582,9 @@ ml_set_crypt_key(buf, old_key, old_cm) idx = ip->ip_index + 1; /* go to next index */ page_count = 1; } + + if (error > 0) + EMSG(_("E843: Error while updating swap file crypt")); } mfp->mf_old_key = NULL; @@ -2384,7 +2387,7 @@ theend: * Make a copy of the line if necessary. */ /* - * get a pointer to a (read-only copy of a) line + * Return a pointer to a (read-only copy of a) line. * * On failure an error message is given and IObuff is returned (to avoid * having to check for error everywhere). @@ -2397,7 +2400,7 @@ ml_get(lnum) } /* - * ml_get_pos: get pointer to position 'pos' + * Return pointer to position "pos". */ char_u * ml_get_pos(pos) @@ -2407,7 +2410,7 @@ ml_get_pos(pos) } /* - * ml_get_curline: get pointer to cursor line. + * Return pointer to cursor line. */ char_u * ml_get_curline() @@ -2416,7 +2419,7 @@ ml_get_curline() } /* - * ml_get_cursor: get pointer to cursor position + * Return pointer to cursor position. */ char_u * ml_get_cursor() @@ -2426,7 +2429,7 @@ ml_get_cursor() } /* - * get a pointer to a line in a specific buffer + * Return a pointer to a line in a specific buffer * * "will_change": if TRUE mark the buffer dirty (chars in the line will be * changed) diff --git a/src/version.c b/src/version.c index f1bd0ab6d..35b42f8da 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 77, +/**/ 76, /**/ 75, |