From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 28 Jan 2012 17:03:35 +0000 (+0100)
Subject: updated for version 7.3.421
X-Git-Tag: v7.3.421
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c70f33440ae141b09d0d2dec279a65a015bfef0;p=vim

updated for version 7.3.421
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.
---

diff --git a/src/option.c b/src/option.c
index 60956d785..033a6d203 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7527,10 +7527,11 @@ set_bool_option(opt_idx, varp, value, opt_flags)
 	{
 	    /* When 'undofile' is set globally: for every buffer, otherwise
 	     * 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
 				|| (opt_flags & OPT_GLOBAL) || opt_flags == 0)
-		    && !curbufIsChanged())
+		    && !curbufIsChanged() && curbuf->b_ml.ml_mfp != NULL)
 	    {
 		u_compute_hash(hash);
 		u_read_undo(NULL, hash, curbuf->b_fname);
diff --git a/src/version.c b/src/version.c
index 9f319837a..b7b6ae84d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    421,
 /**/
     420,
 /**/