updated for version 7.2-220

src/fileio.c

@@ -8441,13 +8441,16 @@ aucmd_prepbuf(aco, buf)
 	win_init_empty(aucmd_win); /* set cursor and topline to safe values */
 
 #ifdef FEAT_WINDOWS
-	/* Split the current window, put the aucmd_win in the upper half. */
+	/* Split the current window, put the aucmd_win in the upper half.
+	 * We don't want the BufEnter or WinEnter autocommands. */
+	block_autocmds();
 	make_snapshot(SNAP_AUCMD_IDX);
 	save_ea = p_ea;
 	p_ea = FALSE;
 	(void)win_split_ins(0, WSP_TOP, aucmd_win, 0);
 	(void)win_comp_pos();   /* recompute window positions */
 	p_ea = save_ea;
+	unblock_autocmds();
 #endif
 	curwin = aucmd_win;
     }
@@ -8474,7 +8477,8 @@ aucmd_restbuf(aco)
 	--curbuf->b_nwindows;
 #ifdef FEAT_WINDOWS
 	/* Find "aucmd_win", it can't be closed, but it may be in another tab
-	 * page. */
+	 * page. Do not trigger autocommands here. */
+	block_autocmds();
 	if (curwin != aucmd_win)
 	{
 	    tabpage_T	*tp;
@@ -8498,6 +8502,7 @@ aucmd_restbuf(aco)
 	last_status(FALSE);	    /* may need to remove last status line */
 	restore_snapshot(SNAP_AUCMD_IDX, FALSE);
 	(void)win_comp_pos();   /* recompute window positions */
+	unblock_autocmds();
 
 	if (win_valid(aco->save_curwin))
 	    curwin = aco->save_curwin;

src/gui.c

@@ -959,7 +959,7 @@ gui_update_cursor(force, clear_selection)
 		guicolor_T fg, bg;
 
 		if (
-# ifdef HAVE_GTK2
+# if defined(HAVE_GTK2) && !defined(FEAT_HANGULIN)
 			preedit_get_status()
 # else
 			im_get_status()

src/gui_photon.c

@@ -838,7 +838,12 @@ gui_ph_handle_window_open(
     static void
 gui_ph_draw_start( void )
 {
+    PhGC_t *gc;
+
+    gc = PgGetGC();
     PgSetRegion( PtWidgetRid( PtFindDisjoint( gui.vimTextArea ) ) );
+    PgClearClippingsCx( gc );
+    PgClearTranslationCx( gc );
 
     PtWidgetOffset( gui.vimTextArea, &gui_ph_raw_offset );
     PhTranslatePoint( &gui_ph_raw_offset, PtWidgetPos( gui.vimTextArea, NULL ) );
@@ -2970,7 +2975,7 @@ gui_mch_init_font(char_u *vim_font_name, int fontset)
     if( vim_font_name == NULL )
     {
 	/* Default font */
-	vim_font_name = "PC Term";
+	vim_font_name = "PC Terminal";
     }
 
     if( STRCMP( vim_font_name, "*" ) == 0 )

src/testdir/Makefile

@@ -4,9 +4,11 @@
 
 VIMPROG = ../vim
 
-# Uncomment this line for using valgrind.
-# The output goes into a file "valgrind.$PID" (sorry, no test number).
-# VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --logfile=valgrind
+# Uncomment this line to use valgrind for memory leaks and extra warnings.
+#   The output goes into a file "valgrind.testN"
+#   Vim should be compiled with EXITFREE to avoid false warnings.
+#   This will make testing about 10 times as slow.
+# VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --log-file=valgrind.$*
 
 SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
 		test7.out test8.out test9.out test10.out test11.out \

src/version.c

@@ -676,6 +676,14 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    220,
+/**/
+    219,
+/**/
+    218,
+/**/
+    217,
 /**/
     216,
 /**/