patch 7.4.959

Problem:    When setting 'term' the clipboard ownership is lost.
Solution:   Do not call clip_init(). (James McCoy)

diff --git a/src/term.c b/src/term.c
index 8488126324367c011aa4ea21a4cf48c80cc68d24..b3201feb10a51ca52b701cee2046e5f12acc3dde 100644 (file)
--- 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 0de1ef56be09b99737df553acb8fbaa3f7346821..6185923c2ff6c457e2e7d39d93f685b0c6533e08 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    959,
 /**/
     958,
 /**/