commit bed7beca58549a98ccebe21d339f0bb461e93f5f
author Bram Moolenaar <Bram@vim.org> Sun Jul 25 13:42:29 2010 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Jul 25 13:42:29 2010 +0200
tree 526cfb9eb68007b53d3838718740c4916403938f
parent 8220a6813ed6889b4aefd2b313ff5e0875eb7952

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

diff --git a/src/buffer.c b/src/buffer.c
index 94e0b2e..22fa136 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3134,7 +3134,7 @@
     }
 
     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

diff --git a/src/testdir/test47.in b/src/testdir/test47.in
index d8384de..c87387b 100644
--- a/src/testdir/test47.in
+++ b/src/testdir/test47.in
@@ -2,6 +2,8 @@
 
 STARTTEST
 :so small.vim
+:" Disable the title to avoid xterm keeping the wrong one.
+:set notitle noicon
 /^1
 yG:new
 pkdd:w! Xtest