summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-07-25 13:42:29 +0200
committerBram Moolenaar <Bram@vim.org>2010-07-25 13:42:29 +0200
commitbed7beca58549a98ccebe21d339f0bb461e93f5f (patch)
tree526cfb9eb68007b53d3838718740c4916403938f /src
parent8220a6813ed6889b4aefd2b313ff5e0875eb7952 (diff)
downloadvim-git-bed7beca58549a98ccebe21d339f0bb461e93f5f.tar.gz
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.
Diffstat (limited to 'src')
-rw-r--r--src/buffer.c2
-rw-r--r--src/testdir/test47.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 94e0b2e0b..22fa13616 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 d8384de78..c87387b2f 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