astepano / rpms / vim

Forked from rpms/vim 6 years ago
Clone
67b939b
To: vim-dev@vim.org
67b939b
Subject: Patch 7.1.259
67b939b
Fcc: outbox
67b939b
From: Bram Moolenaar <Bram@moolenaar.net>
67b939b
Mime-Version: 1.0
67b939b
Content-Type: text/plain; charset=ISO-8859-1
67b939b
Content-Transfer-Encoding: 8bit
67b939b
------------
67b939b
67b939b
Patch 7.1.259
67b939b
Problem:    Cursor is in the wrong position when 'rightleft' is set,
67b939b
	    'encoding' is "utf-8" and on an illegal byte.  (Dominique Pelle)
67b939b
Solution:   Only put the cursor in the first column when actually on a
67b939b
	    double-wide character.  (Yukihiro Nakadaira)
67b939b
Files:	    src/screen.c
67b939b
67b939b
67b939b
*** ../vim-7.1.258/src/screen.c	Wed Feb 13 21:48:24 2008
67b939b
--- src/screen.c	Wed Feb 20 14:06:26 2008
67b939b
***************
67b939b
*** 8045,8053 ****
67b939b
  	windgoto(W_WINROW(curwin) + curwin->w_wrow,
67b939b
  		W_WINCOL(curwin) + (
67b939b
  #ifdef FEAT_RIGHTLEFT
67b939b
  		curwin->w_p_rl ? ((int)W_WIDTH(curwin) - curwin->w_wcol - (
67b939b
  # ifdef FEAT_MBYTE
67b939b
! 			has_mbyte ? (*mb_ptr2cells)(ml_get_cursor()) :
67b939b
  # endif
67b939b
  			1)) :
67b939b
  #endif
67b939b
--- 8045,8057 ----
67b939b
  	windgoto(W_WINROW(curwin) + curwin->w_wrow,
67b939b
  		W_WINCOL(curwin) + (
67b939b
  #ifdef FEAT_RIGHTLEFT
67b939b
+ 		/* With 'rightleft' set and the cursor on a double-wide
67b939b
+ 		 * character, position it on the leftmost column. */
67b939b
  		curwin->w_p_rl ? ((int)W_WIDTH(curwin) - curwin->w_wcol - (
67b939b
  # ifdef FEAT_MBYTE
67b939b
! 			(has_mbyte
67b939b
! 			   && (*mb_ptr2cells)(ml_get_cursor()) == 2
67b939b
! 			   && vim_isprintc(gchar_cursor())) ? 2 :
67b939b
  # endif
67b939b
  			1)) :
67b939b
  #endif
67b939b
*** ../vim-7.1.258/src/version.c	Wed Feb 20 13:41:14 2008
67b939b
--- src/version.c	Wed Feb 20 14:10:23 2008
67b939b
***************
67b939b
*** 668,669 ****
67b939b
--- 668,671 ----
67b939b
  {   /* Add new patch number below this line */
67b939b
+ /**/
67b939b
+     259,
67b939b
  /**/
67b939b
67b939b
-- 
67b939b
A day without sunshine is like, well, night.
67b939b
67b939b
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
67b939b
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
67b939b
\\\        download, build and distribute -- http://www.A-A-P.org        ///
67b939b
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///