# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1280058149 -7200
# Node ID ce5a380d51446acd4de9ed81398a8b1da05ad975
# Parent  f380d5227fad2e57a2ea03ef3c18e34c204a2b21
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.

diff --git a/src/buffer.c b/src/buffer.c
--- a/src/buffer.c
+++ b/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)
diff --git a/src/testdir/test47.in b/src/testdir/test47.in
--- a/src/testdir/test47.in
+++ b/src/testdir/test47.in
@@ -2,6 +2,8 @@ Tests for vertical splits and filler lin
 
 STARTTEST
 :so small.vim
+:" Disable the title to avoid xterm keeping the wrong one.
+:set notitle noicon
 /^1
 yG:new
 pkdd:w! Xtest