updated for version 7.2-299

src/fileio.c

@@ -8597,6 +8597,7 @@ aucmd_restbuf(aco)
 	    curwin = firstwin;
 # ifdef FEAT_EVAL
 	vars_clear(&aucmd_win->w_vars.dv_hashtab);  /* free all w: variables */
+	hash_init(&aucmd_win->w_vars.dv_hashtab);   /* re-use the hashtab */
 # endif
 #else
 	curwin = aco->save_curwin;

src/main.c

@@ -3151,7 +3151,7 @@ usage()
     main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
 #endif
 #ifdef STARTUPTIME
-    main_msg(_("--startuptime=<file>\tWrite startup timing messages to <file>"));
+    main_msg(_("--startuptime <file>\tWrite startup timing messages to <file>"));
 #endif
 #ifdef FEAT_VIMINFO
     main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));

src/misc1.c

@@ -1121,7 +1121,7 @@ open_line(dir, flags, old_indent)
 			    if (i != lead_repl_len)
 			    {
 				mch_memmove(p + lead_repl_len, p + i,
-				       (size_t)(lead_len - i - (leader - p)));
+				       (size_t)(lead_len - i - (p - leader)));
 				lead_len += lead_repl_len - i;
 			    }
 			}

src/ops.c

@@ -3991,6 +3991,14 @@ ex_display(eap)
 	}
 	else
 	    yb = &(y_regs[i]);
+
+#ifdef FEAT_EVAL
+	if (name == MB_TOLOWER(redir_reg)
+		|| (redir_reg == '"' && yb == y_previous))
+	    continue;	    /* do not list register being written to, the
+			     * pointer can be freed */
+#endif
+
 	if (yb->y_array != NULL)
 	{
 	    msg_putchar('\n');
@@ -6090,7 +6098,7 @@ str_to_reg(y_ptr, type, str, len, blocklen)
     long	maxlen;
 #endif
 
-    if (y_ptr->y_array == NULL)		/* NULL means emtpy register */
+    if (y_ptr->y_array == NULL)		/* NULL means empty register */
 	y_ptr->y_size = 0;
 
     /*

src/version.c

@@ -681,6 +681,14 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    299,
+/**/
+    298,
+/**/
+    297,
+/**/
+    296,
 /**/
     295,
 /**/