To: vim-dev@vim.org
Subject: Patch 6.1b.006
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1b.006
Problem:    When entering a composing character on the command line with
	    CTRL-V, the text isn't redrawn correctly.
Solution:   Redraw the text under and after the cursor.
Files:	    src/ex_getln.c


*** ../vim61b.005/src/ex_getln.c	Thu Feb 28 21:20:51 2002
--- src/ex_getln.c	Fri Mar 15 19:51:52 2002
***************
*** 1261,1266 ****
--- 1261,1276 ----
  		putcmdline('^', TRUE);
  		c = get_literal();	    /* get next (two) character(s) */
  		do_abbr = FALSE;	    /* don't do abbreviation now */
+ #ifdef FEAT_MBYTE
+ 		/* may need to remove ^ when composing char was typed */
+ 		if (enc_utf8 && utf_iscomposing(c) && !cmd_silent)
+ 		{
+ 		    msg_outtrans_len(ccline.cmdbuff + ccline.cmdpos,
+ 					       ccline.cmdlen - ccline.cmdpos);
+ 		    msg_putchar(' ');
+ 		    cursorcmd();
+ 		}
+ #endif
  		break;
  
  #ifdef FEAT_DIGRAPHS
*** ../vim61b.005/src/version.c	Tue Mar 12 22:31:40 2002
--- src/version.c	Fri Mar 15 19:53:23 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     6,
  /**/

-- 
Vim is like Emacs without all the typing.  (John "Johann" Spetz)

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///