--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1721,6 +1721,7 @@ A jump table for the options with a shor
 	  i		Insert mode
 	  c		Command line editing, for 'incsearch'
 
+	'v' applies to all lines in the Visual area, not only the cursor.
 	A useful value is "nc".  This is used in help files.  So long as you
 	are moving around text is concealed, but when starting to insert text
 	or selecting a Visual area the concealed text is displayed, so that

--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -30,13 +30,16 @@ be worked on, but only if you sponsor Vi
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Diff python and python3 code, some is missing in python3.
-
-Before release 7.3:
-- Rename vim73 branch to default (hints: Xavier de Gaye, 2010 May 23)
+if_python3.c is missing some changes that were applied to if_python.c.
+Find the old version of if_python.c from when the copy was made.
+
+Move more common code from if_python.c and if_python3.c to if_py_both.h
 
 Add documentation for Python 3 support.
 
+Include patch for horizontal scoll wheel? (Bjorn Winckler, 2010 Jul 20)
+Additional patch Jul 21.
+
 6   In the quickfix window statusline add the command used to get the list of
     errors, e.g. ":make foo", ":grep something *.c".
     New patch 2010 Jul 24
@@ -45,12 +48,8 @@ 6   In the quickfix window statusline ad
 Patch for :find completion. (Nazri Ramliy)
 But I prefer to keep term.h and include/term.h  He will work on it.
 
-'fenc' in modeline problem: add option to reload the file when 'fenc' is set
-to a different value in a modeline?  Option can be default on.
-Could be done with an autocommand?
-
-Include patch for horizontal scoll wheel? (Bjorn Winckler, 2010 Jul 20)
-Additional patch Jul 21.
+Before release 7.3:
+- Rename vim73 branch to default (hints: Xavier de Gaye, 2010 May 23)
 
 Cursor positioning wrong with 0x200e character. (John Becket, 2010 May 6)
 
@@ -1099,11 +1098,6 @@ Also: Get an error message from free() i
 Seems to happen when the selection is requested the second time, but before
 clip_x11_convert_selection_cb() is invoked, thus in X library code.
 
-Add 'lazysize' option: Above this size Vim doesn't load everything before
-starting to edit a file.  Things like 'fileencodings' only work up to this
-size, modelines only work at the top.  Useful for large log files where you
-only want to look at the first few pages.  Use zero to disable it.
-
 ":vimgrep" does not recognize a recursive symlink.  Is it possible to detect
 this, at least for Unix (using device/inode)?
 
@@ -2397,6 +2391,9 @@ 9   When the tail byte of a double-byte 
     display is messed up (Yasuhiro Matsumoto).  Should check for illegal
     double-byte characters and display them differently (display each single
     byte).
+9   'fenc' in modeline problem: add option to reload the file when 'fenc' is
+    set to a different value in a modeline?  Option can be default on.  Could
+    it be done with an autocommand?
 8   Add an item in 'fileencodings' to check the first lines of a file for
     the encoding.  See Python PEP: http://www.python.org/peps/pep-0263.html.
     To avoid getting a wrong encoding only accept something Emacs-like:
@@ -2788,6 +2785,10 @@ 6   Add file locking.  Lock a file when 
 Performance:
 7   For string variables up to 3 bytes don't allocate memory, use v_list
     itself as a character array.  Use VAR_SSTRING (short string).
+7   Add 'lazysize' option: Above this size Vim doesn't load everything before
+    starting to edit a file.  Things like 'fileencodings' only work up to this
+    size, modelines only work at the top.  Useful for large log files where
+    you only want to look at the first few pages.  Use zero to disable it.
 8   move_lines() copies every line into allocated memory, making reloading a
     buffer a lot slower than re-editing the file.  Can the memline be locked
     so that we don't need to make a copy?  Or avoid invoking ml_updatechunk(),

--- a/src/screen.c
+++ b/src/screen.c
@@ -4427,7 +4427,8 @@ win_line(wp, lnum, startrow, endrow, noc
 		&& (wp != curwin || lnum != wp->w_cursor.lnum ||
 						      conceal_cursor_line(wp))
 		&& (syntax_flags & HL_CONCEAL) != 0
-		&& !lnum_in_visual_area)
+		&& !(lnum_in_visual_area
+				    && vim_strchr(wp->w_p_cocu, 'v') == NULL))
 	    {
 		char_attr = conceal_attr;
 		if (prev_syntax_id != syntax_seqnr