Fix: When entering a digraph or special character after a line that fits the

window the '?' or '^' on the next line is not redrawn. (Ian Kelling)

2 files changed, 16 insertions, 12 deletions

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 2400a8b3cd..fab62976fe 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1091,11 +1091,6 @@ Before (beta) release 7.3:
 
 Vim 7.3:
 Patches to possibly include:
-- Replace ccomplete.vim by cppcomplete.vim from www.vim.org?  script 1520 by
-  Vissale Neang.  (Martin Stubenschrott)
-  Asked Vissale to make the scripts more friendly for the Vim distribution.
-  New version received 2008 Jan 6.
-- Patch for supporting #rrggbb in color terminals.  (Matt Wozniski)
 6   In the quickfix window statusline add the command used to get the list of
     errors, e.g. ":make foo", ":grep something *.c".
     Patch by Lech Lorens, 2009 Mar 23.
@@ -1103,10 +1098,6 @@ Patches to possibly include:
     Docs patch by Dominique Pelle, Mar 25
     Update 2009 Mar 28.
     Fix for invalid memory access. (Lech Lorens, 2009 Apr 17)
-- Another patch for Javascript indenting. (Hari Kumar, 2010 Jul 11)
-  Needs a few tests.
-- Redraw problem when appending digraph causes line to wrap. (James Vega, 2007
-  Sep 18)  Patch by Ian Kelling, 2008 Aug 8.
 - Patch for colorscheme submenu. (Juergen Kraemer, 2008 Aug 20)
 - 9   Make it possible to drag a tab page label to another position with the
     mouse.
@@ -1135,6 +1126,8 @@ Needs some work:
 
 
 More patches:
+-   Another patch for Javascript indenting. (Hari Kumar, 2010 Jul 11)
+    Needs a few tests.
 -   Add 'cscopeignorecase' option. (Liang Wenzhi, 2006 Sept 3)
 -   Argument for feedkeys() to prepend to typeahead (Yakov Lerner, 2006 Oct
     21)
@@ -1164,8 +1157,13 @@ More patches:
     Sep 13)
 -   Patch for adding "space" item in 'listchars'. (Jérémie Roquet, 2009 Oct 29,
     Docs patch Oct 30)
--   Patch to support clipboard for Mac terminal. (Jjgod Jiang, 2009 Aug 1)
-    Needs to be updated for block-wise selection.
+-   Patch for supporting #rrggbb in color terminals.  (Matt Wozniski)
+    Where is a recent version of this patch?
+-   Replace ccomplete.vim by cppcomplete.vim from www.vim.org?  script 1520 by
+    Vissale Neang.  (Martin Stubenschrott) Asked Vissale to make the scripts
+    more friendly for the Vim distribution.
+    New version received 2008 Jan 6.
+    No maintenance in two years...
 
 
 Awaiting updated patches:
diff --git a/src/edit.c b/src/edit.c
index 2db06cf0c1..e5f6b3312b 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1547,6 +1547,8 @@ ins_ctrl_v()
 #endif
 
     c = get_literal();
+    edit_unputchar();  /* when line fits in 'columns' the '^' is at the start
+			  of the next line and will not be redrawn */
 #ifdef FEAT_CMDL_INFO
     clear_showcmd();
 #endif
@@ -9620,6 +9622,9 @@ ins_digraph()
     c = plain_vgetc();
     --no_mapping;
     --allow_keys;
+    edit_unputchar();  /* when line fits in 'columns' the '?' is at the start
+			  of the next line and will not be redrawn */
+
     if (IS_SPECIAL(c) || mod_mask)	    /* special key */
     {
 #ifdef FEAT_CMDL_INFO
@@ -9652,6 +9657,8 @@ ins_digraph()
 	cc = plain_vgetc();
 	--no_mapping;
 	--allow_keys;
+	edit_unputchar();  /* when line fits in 'columns' the '?' is at the
+			      start of the next line and will not be redrawn */
 	if (cc != ESC)
 	{
 	    AppendToRedobuff((char_u *)CTRL_V_STR);
@@ -9662,7 +9669,6 @@ ins_digraph()
 	    return c;
 	}
     }
-    edit_unputchar();
 #ifdef FEAT_CMDL_INFO
     clear_showcmd();
 #endif