From b2b6bde035ca99671efea767716dbd57796e7453 Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Thu, 8 Nov 2007 11:38:57 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@639 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/ops.c     | 5 +++--
 src/version.c | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/ops.c b/src/ops.c
index 8f003140..ea5e20bd 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -933,9 +933,10 @@ get_register(name, copy)
 #ifdef FEAT_CLIPBOARD
     /* When Visual area changed, may have to update selection.  Obtain the
      * selection too. */
-    if (name == '*' && clip_star.available && clip_isautosel())
+    if (name == '*' && clip_star.available)
     {
-	clip_update_selection();
+	if (clip_isautosel())
+	    clip_update_selection();
 	may_get_selection(name);
     }
 #endif
diff --git a/src/version.c b/src/version.c
index 1857c917..d365e859 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    150,
+/**/
     149,
 /**/
     148,
-- 
2.11.4.GIT