thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

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

Browse Source
This commit is contained in:
Bram Moolenaar
2010-07-24 13:15:07 +02:00
parent d497a30cbe
commit f70e3d6c7e
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/options.txt
View File

@@ -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 are moving around text is concealed, but when starting to insert text
or selecting a Visual area the concealed text is displayed, so that or selecting a Visual area the concealed text is displayed, so that
you can see what you are doing. 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'* 'conceallevel' 'cole' *'conceallevel'* *'cole'*

14
runtime/doc/todo.txt
View File

@@ -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 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. 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 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. 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) Include patch for horizontal scoll wheel? (Bjorn Winckler, 2010 Jul 20)
Additional patch Jul 21. 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 Problem with transparent cmdline. Also: Terminal title is wrong with
non-ASCII character. (Lily White, 2010 Mar 7) 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) Patch for horizontal mouse wheel. (Bjorn Winckler, 2010 Jul 18)
iconv() doesn't fail on an illegal character, as documented. (Yongwei Wu, 2009 iconv() doesn't fail on an illegal character, as documented. (Yongwei Wu, 2009

3
src/screen.c
View File

@@ -4424,7 +4424,8 @@ win_line(wp, lnum, startrow, endrow, nochange)
if ( wp->w_p_cole > 0 if ( wp->w_p_cole > 0
&& (wp != curwin || lnum != wp->w_cursor.lnum || && (wp != curwin || lnum != wp->w_cursor.lnum ||
conceal_cursor_line(wp)) conceal_cursor_line(wp))
&& (syntax_flags & HL_CONCEAL) != 0) && (syntax_flags & HL_CONCEAL) != 0
&& !lnum_in_visual_area)
{ {
char_attr = conceal_attr; char_attr = conceal_attr;
if (prev_syntax_id != syntax_id if (prev_syntax_id != syntax_id