From bed7beca58549a98ccebe21d339f0bb461e93f5f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 25 Jul 2010 13:42:29 +0200
Subject: [PATCH] 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          | 2 +-
 src/testdir/test47.in | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/buffer.c b/src/buffer.c
index 94e0b2e0b9..22fa136168 100644
--- 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
index d8384de785..c87387b2fd 100644
--- a/src/testdir/test47.in
+++ b/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
-- 
GitLab