Skip to content

Commit

Permalink
updated for version 7.3.646
Browse files Browse the repository at this point in the history
Problem:    When reloading a buffer the undo file becomes unusable unless ":w"
	    is executed. (Dmitri Frank)
Solution:   After reloading the buffer write the undo file. (Christian
	    Brabandt)
  • Loading branch information
brammool committed Aug 29, 2012
1 parent 718e978 commit 7216004
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
15 changes: 15 additions & 0 deletions src/fileio.c
Expand Up @@ -7060,8 +7060,23 @@ buf_check_timestamp(buf, focus)
}

if (reload)
{
/* Reload the buffer. */
buf_reload(buf, orig_mode);
#ifdef FEAT_PERSISTENT_UNDO
if (buf->b_p_udf && buf->b_ffname != NULL)
{
char_u hash[UNDO_HASH_SIZE];
buf_T *save_curbuf = curbuf;

/* Any existing undo file is unusable, write it now. */
curbuf = buf;
u_compute_hash(hash);
u_write_undo(NULL, FALSE, buf, hash);
curbuf = save_curbuf;
}
#endif
}

#ifdef FEAT_AUTOCMD
/* Trigger FileChangedShell when the file was changed in any way. */
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -719,6 +719,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
646,
/**/
645,
/**/
Expand Down

0 comments on commit 7216004

Please sign in to comment.