ff10d22
To: vim-dev@vim.org
ff10d22
Subject: Patch 7.0.089
ff10d22
Fcc: outbox
ff10d22
From: Bram Moolenaar <Bram@moolenaar.net>
ff10d22
Mime-Version: 1.0
ff10d22
Content-Type: text/plain; charset=ISO-8859-1
ff10d22
Content-Transfer-Encoding: 8bit
ff10d22
------------
ff10d22
ff10d22
Patch 7.0.089
ff10d22
Problem:    "ga" does not work properly for a non-Unicode multi-byte encoding.
ff10d22
Solution:   Only check for composing chars for utf-8. (Taro Muraoka)
ff10d22
Files:	    src/ex_cmds.c
ff10d22
ff10d22
ff10d22
*** ../vim-7.0.088/src/ex_cmds.c	Tue Sep  5 16:29:38 2006
ff10d22
--- src/ex_cmds.c	Tue Sep  5 18:12:41 2006
ff10d22
***************
ff10d22
*** 95,101 ****
ff10d22
  		_("<%s>%s%s  %d,  Hex %02x,  Octal %03o"),
ff10d22
  					   transchar(c), buf1, buf2, c, c, c);
ff10d22
  #ifdef FEAT_MBYTE
ff10d22
! 	c = cc[ci++];
ff10d22
  #endif
ff10d22
      }
ff10d22
  
ff10d22
--- 95,104 ----
ff10d22
  		_("<%s>%s%s  %d,  Hex %02x,  Octal %03o"),
ff10d22
  					   transchar(c), buf1, buf2, c, c, c);
ff10d22
  #ifdef FEAT_MBYTE
ff10d22
! 	if (enc_utf8)
ff10d22
! 	    c = cc[ci++];
ff10d22
! 	else
ff10d22
! 	    c = 0;
ff10d22
  #endif
ff10d22
      }
ff10d22
  
ff10d22
***************
ff10d22
*** 108,114 ****
ff10d22
  	if (len > 0)
ff10d22
  	    IObuff[len++] = ' ';
ff10d22
  	IObuff[len++] = '<';
ff10d22
! 	if (utf_iscomposing(c)
ff10d22
  # ifdef USE_GUI
ff10d22
  		&& !gui.in_use
ff10d22
  # endif
ff10d22
--- 111,117 ----
ff10d22
  	if (len > 0)
ff10d22
  	    IObuff[len++] = ' ';
ff10d22
  	IObuff[len++] = '<';
ff10d22
! 	if (enc_utf8 && utf_iscomposing(c)
ff10d22
  # ifdef USE_GUI
ff10d22
  		&& !gui.in_use
ff10d22
  # endif
ff10d22
***************
ff10d22
*** 120,126 ****
ff10d22
  				    : _("> %d, Hex %08x, Octal %o"), c, c, c);
ff10d22
  	if (ci == MAX_MCO)
ff10d22
  	    break;
ff10d22
! 	c = cc[ci++];
ff10d22
      }
ff10d22
  #endif
ff10d22
  
ff10d22
--- 123,132 ----
ff10d22
  				    : _("> %d, Hex %08x, Octal %o"), c, c, c);
ff10d22
  	if (ci == MAX_MCO)
ff10d22
  	    break;
ff10d22
! 	if (enc_utf8)
ff10d22
! 	    c = cc[ci++];
ff10d22
! 	else
ff10d22
! 	    c = 0;
ff10d22
      }
ff10d22
  #endif
ff10d22
  
ff10d22
*** ../vim-7.0.088/src/version.c	Tue Sep  5 17:30:25 2006
ff10d22
--- src/version.c	Tue Sep  5 18:19:42 2006
ff10d22
***************
ff10d22
*** 668,669 ****
ff10d22
--- 668,671 ----
ff10d22
  {   /* Add new patch number below this line */
ff10d22
+ /**/
ff10d22
+     89,
ff10d22
  /**/
ff10d22
ff10d22
-- 
ff10d22
    [clop clop]
ff10d22
GUARD #1:  Halt!  Who goes there?
ff10d22
ARTHUR:    It is I, Arthur, son of Uther Pendragon, from the castle of
ff10d22
           Camelot.  King of the Britons, defeator of the Saxons, sovereign of
ff10d22
           all England!
ff10d22
GUARD #1:  Pull the other one!
ff10d22
                                  The Quest for the Holy Grail (Monty Python)
ff10d22
ff10d22
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
ff10d22
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
ff10d22
\\\        download, build and distribute -- http://www.A-A-P.org        ///
ff10d22
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///