summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-08-15 17:26:57 +0200
committerBram Moolenaar <Bram@vim.org>2012-08-15 17:26:57 +0200
commitdd82d699c8cb3e60b2da968fb40622dc497f71ca (patch)
treece997018fac43a6ac12ca676d4d202128032d28e
parent2b9578f0f8cdba144e996273bca586b384e33d90 (diff)
downloadvim-git-dd82d699c8cb3e60b2da968fb40622dc497f71ca.tar.gz
updated for version 7.3.633v7.3.633
Problem: Selection remains displayed as selected after selecting another text. Solution: Call xterm_update() before select(). (Andrew Pimlott)
-rw-r--r--src/os_unix.c8
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 98ff1ea66..2ef589350 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5196,6 +5196,10 @@ select_eintr:
FD_SET(ConnectionNumber(xterm_dpy), &rfds);
if (maxfd < ConnectionNumber(xterm_dpy))
maxfd = ConnectionNumber(xterm_dpy);
+
+ /* An event may have already been read but not handled. In
+ * particulary, XFlush may cause this. */
+ xterm_update();
}
# endif
# ifdef FEAT_MOUSE_GPM
@@ -5216,14 +5220,14 @@ select_eintr:
maxfd = xsmp_icefd;
}
# endif
-#ifdef FEAT_NETBEANS_INTG
+# ifdef FEAT_NETBEANS_INTG
if (nb_fd != -1)
{
FD_SET(nb_fd, &rfds);
if (maxfd < nb_fd)
maxfd = nb_fd;
}
-#endif
+# endif
# ifdef OLD_VMS
/* Old VMS as v6.2 and older have broken select(). It waits more than
diff --git a/src/version.c b/src/version.c
index a9f80b14c..b02216a1f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 633,
+/**/
632,
/**/
631,