summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-12-03 21:17:24 +0100
committerBram Moolenaar <Bram@vim.org>2015-12-03 21:17:24 +0100
commit0379d01c52e7930ccfc9133f229fba54a2024a42 (patch)
treeebc63614a37fb4607ea0ff3b878162816be0c603 /src
parente1a61991d9b6fd5f65636d17583f93118268cda5 (diff)
downloadvim-git-0379d01c52e7930ccfc9133f229fba54a2024a42.tar.gz
patch 7.4.959v7.4.959
Problem: When setting 'term' the clipboard ownership is lost. Solution: Do not call clip_init(). (James McCoy)
Diffstat (limited to 'src')
-rw-r--r--src/term.c8
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 8 deletions
diff --git a/src/term.c b/src/term.c
index 848812632..b3201feb1 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1880,14 +1880,6 @@ set_termname(term)
p = (char_u *)"";
# ifdef FEAT_MOUSE_XTERM
-# ifdef FEAT_CLIPBOARD
-# ifdef FEAT_GUI
- if (!gui.in_use)
-# endif
-# ifndef FEAT_CYGWIN_WIN32_CLIPBOARD
- clip_init(FALSE);
-# endif
-# endif
if (use_xterm_like_mouse(term))
{
if (use_xterm_mouse())
diff --git a/src/version.c b/src/version.c
index 0de1ef56b..6185923c2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 959,
+/**/
958,
/**/
957,