summaryrefslogtreecommitdiff
path: root/src/os_unix.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-07-09 19:13:49 +0200
committerBram Moolenaar <Bram@vim.org>2014-07-09 19:13:49 +0200
commit0d1e8c12034ae51b4f31cbe81534df491b837028 (patch)
treef76895df4fb34111e765955d3d78a200da3bfc19 /src/os_unix.c
parent6bf5548df2d58215c99d582269b4ec9e7fb0c934 (diff)
downloadvim-git-0d1e8c12034ae51b4f31cbe81534df491b837028.tar.gz
updated for version 7.4.359v7.4.359
Problem: When 'ttymouse' is set to 'uxterm' the xterm version is not requested. (Tomas Janousek) Solution: Do not mark uxterm as a conflict mouse and add resume_get_esc_sequence().
Diffstat (limited to 'src/os_unix.c')
-rw-r--r--src/os_unix.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index db64fb45f..033ce3cc3 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3780,9 +3780,6 @@ check_mouse_termcode()
# ifdef FEAT_MOUSE_URXVT
/* same as the dec mouse */
if (use_xterm_mouse() == 3
-# ifdef FEAT_TERMRESPONSE
- && !did_request_esc_sequence()
-# endif
# ifdef FEAT_GUI
&& !gui.in_use
# endif
@@ -3797,7 +3794,8 @@ check_mouse_termcode()
mch_setmouse(FALSE);
setmouse();
}
- xterm_conflict_mouse = TRUE;
+ /* It's OK to request the xterm version for uxterm. */
+ resume_get_esc_sequence();
}
else
del_mouse_termcode(KS_URXVT_MOUSE);