Fix: when resetting both 'title' and 'icon' the title would be set after a

shell command.
Reset 'title' and 'icon' in test47 to avoid the xterm title getting messed up.

src/buffer.c

@@ -3134,7 +3134,7 @@ maketitle()
     }
 
     need_maketitle = FALSE;
-    if (!p_title && !p_icon)
+    if (!p_title && !p_icon && lasttitle == NULL && lasticon == NULL)
 	return;
 
     if (p_title)

src/testdir/test47.in

@@ -2,6 +2,8 @@ Tests for vertical splits and filler lines in diff mode
 
 STARTTEST
 :so small.vim
+:" Disable the title to avoid xterm keeping the wrong one.
+:set notitle noicon
 /^1
 yG:new
 pkdd:w! Xtest