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

updated for version 7.3.421

Browse Source 
Problem:    Get E832 when setting 'undofile' in vimrc and there is a file to
            be edited on the command line. (Toothpik)
Solution:   Do not try reading the undo file for a file that wasn't loaded.
This commit is contained in:
Bram Moolenaar 2012-01-28 18:03:35 +01:00
parent 16c31fe1b7
commit 3c70f33440
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/option.c
View File

@ -7527,10 +7527,11 @@ set_bool_option(opt_idx, varp, value, opt_flags)
{ {
/* When 'undofile' is set globally: for every buffer, otherwise /* When 'undofile' is set globally: for every buffer, otherwise
* only for the current buffer: Try to read in the undofile, if * only for the current buffer: Try to read in the undofile, if
* one exists and the buffer wasn't changed. */ * one exists and the buffer wasn't changed and the buffer was
* loaded. */
if ((curbuf == save_curbuf if ((curbuf == save_curbuf
|| (opt_flags & OPT_GLOBAL) || opt_flags == 0) || (opt_flags & OPT_GLOBAL) || opt_flags == 0)
&& !curbufIsChanged()) && !curbufIsChanged() && curbuf->b_ml.ml_mfp != NULL)
{ {
u_compute_hash(hash); u_compute_hash(hash);
u_read_undo(NULL, hash, curbuf->b_fname); u_read_undo(NULL, hash, curbuf->b_fname);

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 */
/**/
421,
/**/ /**/
420, 420,
/**/ /**/