thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.077

Browse Source 
Problem:    When updating crypt of swapfile fails there is no error message.
            (Carlo Teubner)
Solution:   Add the error message.
This commit is contained in:
Bram Moolenaar
2010-12-08 13:17:03 +01:00
parent e980d8a934
commit 2e2e13ca14
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/memline.c
View File

@@ -582,6 +582,9 @@ ml_set_crypt_key(buf, old_key, old_cm)
idx = ip->ip_index + 1; /* go to next index */ idx = ip->ip_index + 1; /* go to next index */
page_count = 1; page_count = 1;
} }
if (error > 0)
EMSG(_("E843: Error while updating swap file crypt"));
} }
mfp->mf_old_key = NULL; mfp->mf_old_key = NULL;
@@ -2384,7 +2387,7 @@ theend:
* Make a copy of the line if necessary. * 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 * On failure an error message is given and IObuff is returned (to avoid
* having to check for error everywhere). * 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 * char_u *
ml_get_pos(pos) 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 * char_u *
ml_get_curline() 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 * char_u *
ml_get_cursor() 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 * "will_change": if TRUE mark the buffer dirty (chars in the line will be
* changed) * changed)

2
src/version.c
View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
77,
/**/ /**/
76, 76,
/**/ /**/