From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 31 Jul 2010 15:59:29 +0000 (+0200)
Subject: Fixed: CTRL-R in Insert mode doesn't insert composing characters.
X-Git-Tag: v7.3~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b1c48569d98597ac0539609c9a922bedba0e081;p=vim

Fixed: CTRL-R in Insert mode doesn't insert composing characters.
---

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index e887fd35f..7f327c4cb 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -37,14 +37,9 @@ Windows 7: installing Vim again doesn't find the previously installed Vim.
 
 Move more common code from if_python.c and if_python3.c to if_py_both.h
 
-Uninspected issues on http://scan.coverity.com/rung2.html
-
 Before release 7.3:
 - Rename vim73 branch to default (hints: Xavier de Gaye, 2010 May 23)
 
-Insert mode CTRL-R x doesn't paste combining characters. (Tony Mechelynck,
-2010 Jul 28)
-
 Cursor positioning wrong with 0x200e character. (John Becket, 2010 May 6)
 
 Test 69 breaks on MS-Windows, both 32 and 64 builds. (George Reilly, 2010 Feb
diff --git a/src/ops.c b/src/ops.c
index d259cca95..beab33c15 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -1439,7 +1439,7 @@ stuffescaped(arg, literally)
 	{
 #ifdef FEAT_MBYTE
 	    if (has_mbyte)
-		c = mb_ptr2char_adv(&arg);
+		c = mb_cptr2char_adv(&arg);
 	    else
 #endif
 		c = *arg++;