From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 24 Jul 2010 11:15:07 +0000 (+0200)
Subject: Don't conceal text in lines inside the Visual area.
X-Git-Tag: v7.3~192
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f70e3d6c7e4139c8d655101a850c03f522cc98b7;p=vim

Don't conceal text in lines inside the Visual area.
---

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 9344e884e..c54927479 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1724,6 +1724,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	are moving around text is concealed, but when starting to insert text
 	or selecting a Visual area the concealed text is displayed, so that
 	you can see what you are doing.
+	Keep in mind that the cursor position is not always where it's
+	displayed.  E.g., when moving vertically it may change column.
 
 
 'conceallevel' 'cole'		*'conceallevel'* *'cole'*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 0a7337d52..87ed10817 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.3b.  Last change: 2010 Jul 23
+*todo.txt*      For Vim version 7.3b.  Last change: 2010 Jul 24
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -32,9 +32,16 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 
 Check position in wrapped line with 'concealcursor' set.
 
+Patch for :find completion. (Nazri Ramliy)
+But I prefer to keep term.h and include/term.h
+
 Trick with syntax ID works, but it's not nice.  Can we give a sequence nr to
 syntax item matches?  At least the ones with a replacement char.
 
+'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.
 
@@ -100,6 +107,11 @@ Jumplist doesn't work properly in Insert mode? (Jean Johner, 2010 Mar 20)
 Problem with transparent cmdline.  Also: Terminal title is wrong with
 non-ASCII character. (Lily White, 2010 Mar 7)
 
+Restoring terminal title in gnome-terminal causes a beep.  Saved value
+contains garbage?  Ukranian language characters.  'enc' and 'tenc' are utf-8.  
+(Anatoli Sakhnik, 2010 Jul 24)
+Using ":set titlestring=abc" with non-ascii characters also fails.
+
 Patch for horizontal mouse wheel. (Bjorn Winckler, 2010 Jul 18)
 
 iconv() doesn't fail on an illegal character, as documented. (Yongwei Wu, 2009
diff --git a/src/screen.c b/src/screen.c
index f9183e126..b7f4f408e 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4424,7 +4424,8 @@ win_line(wp, lnum, startrow, endrow, nochange)
 	    if (   wp->w_p_cole > 0
 		&& (wp != curwin || lnum != wp->w_cursor.lnum ||
 						      conceal_cursor_line(wp))
-		&& (syntax_flags & HL_CONCEAL) != 0)
+		&& (syntax_flags & HL_CONCEAL) != 0
+		&& !lnum_in_visual_area)
 	    {
 		char_attr = conceal_attr;
 		if (prev_syntax_id != syntax_id