summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-02-20 13:16:29 +0000
committerBram Moolenaar <Bram@vim.org>2008-02-20 13:16:29 +0000
commit561f9db88cf4e69f27fcca1b02e78e7b72294acc (patch)
tree9d19d6a7b0206cde10d4431930793dd790dc2ef5
parent5bcbd537b4f4c61621db36341a20f867473aa582 (diff)
updated for version 7.1-259v7.1.259
-rw-r--r--src/screen.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index 219b664318..a739927254 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -8045,9 +8045,13 @@ setcursor()
windgoto(W_WINROW(curwin) + curwin->w_wrow,
W_WINCOL(curwin) + (
#ifdef FEAT_RIGHTLEFT
+ /* With 'rightleft' set and the cursor on a double-wide
+ * character, position it on the leftmost column. */
curwin->w_p_rl ? ((int)W_WIDTH(curwin) - curwin->w_wcol - (
# ifdef FEAT_MBYTE
- has_mbyte ? (*mb_ptr2cells)(ml_get_cursor()) :
+ (has_mbyte
+ && (*mb_ptr2cells)(ml_get_cursor()) == 2
+ && vim_isprintc(gchar_cursor())) ? 2 :
# endif
1)) :
#endif
diff --git a/src/version.c b/src/version.c
index 21701b794c..459c90e5fc 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 */
/**/
+ 259,
+/**/
258,
/**/
257,