Mercurial > vim

changeset 7307:5d9e27621ffa v7.4.959

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/0379d01c52e7930ccfc9133f229fba54a2024a42 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Dec 3 21:17:24 2015 +0100 patch 7.4.959 Problem: When setting 'term' the clipboard ownership is lost. Solution: Do not call clip_init(). (James McCoy)
author Christian Brabandt <cb@256bit.org>
date Thu, 03 Dec 2015 21:30:05 +0100
parents a9dc9da618a4
children 8ccc46a81ecb
files src/term.c src/version.c
diffstat 2 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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())
--- 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,