diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 642f52fc1e94c2defa400f0d1f5b04b9e684b2d7..6d2036e454152f5126b583c52fa8db0afdc4810b 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.3f.  Last change: 2010 Aug 12
+*todo.txt*      For Vim version 7.3f.  Last change: 2010 Aug 13
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,10 +30,12 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-'cursorline' stops too early in a help file, caused by conceal feature.
-
 Have a close look at :find completion, anything that could be wrong?
 
+Patch for :python + :py3. (James Vega, Roland Puntaier, 2010 Aug 12)
+
+Patch for crash with cmdline editing functions. (Dominique Pelle, 2010 Aug 12)
+
 Test 73 fails on MS-Windows when compiled with DJGPP.
 :find completion with 'path' set to "./**" results in full path for
 "./subdir/file", should shorten to start with "./".
@@ -60,6 +62,8 @@ Editing a file with a ^M with 'ff' set to "mac", opening a help file, then the
 Problem producing tags file when hebrew.frx is present.  It has a BOM.
 Results in E670. (Tony Mechelynck, 2010 May 2)
 
+setpos() does not resture cursor position after :normal. (Tyru, 2010 Aug 11)
+
 'cindent' not correct when 'list' is set. (Zdravi Korusef, 2010 Apr 15)
 
 ":helpgrep" does not put the cursor in the correct column when preceded by
diff --git a/src/screen.c b/src/screen.c
index a933d6cb0c10784871af1bb113e100bf7bd82367..380eb8b3b9dae7b2bbd3eb6f25736dc8d94e26cc 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4399,7 +4399,11 @@ win_line(wp, lnum, startrow, endrow, nochange)
 # ifdef FEAT_RIGHTLEFT
 			    wp->w_p_rl ? (col >= 0) :
 # endif
-			    (col < W_WIDTH(wp))))
+			    (col
+# ifdef FEAT_CONCEAL
+				- boguscols
+# endif
+					    < W_WIDTH(wp))))
 		{
 		    /* Highlight until the right side of the window */
 		    c = ' ';