aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

Couple of small fixes for conceal feature. (Dominique Pelle)

Browse Source
This commit is contained in:
Bram Moolenaar
2010-06-22 05:16:38 +02:00
parent 883f5d08e4
commit 370df58df9
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/doc/syntax.txt
View File

@@ -3135,8 +3135,10 @@ These arguments can be used for all three commands:
conceal *conceal* *:syn-conceal* conceal *conceal* *:syn-conceal*
When the "conceal" argument is given, the item is marked as concealable. When the "conceal" argument is given, the item is marked as concealable.
Whether or not it is actually concealed depends on the setting on the Whether or not it is actually concealed depends on the value of the
'conceallevel' option. 'conceallevel' option. If 'modifiable' option is on, concealable items
in the current line are always displayed unconcealed to be able to edit
the line.
concealends *:syn-concealends* concealends *:syn-concealends*

5
runtime/doc/todo.txt
View File

@@ -1088,11 +1088,8 @@ Vim 7.3:
- using NSIS 2.46: install on Windows 7 works, but no "Edit with Vim" menu. - using NSIS 2.46: install on Windows 7 works, but no "Edit with Vim" menu.
Use register_shell_extension()? (George Reilly, 2010 May 26) Use register_shell_extension()? (George Reilly, 2010 May 26)
Ron's version: http://dev.ronware.org/p/vim/finfo?name=gvim.nsi Ron's version: http://dev.ronware.org/p/vim/finfo?name=gvim.nsi
- Patch for conceal feature and 'foldcolumn'. (Dominique Pelle, 2010 Jun 10, - Patch for conceal from Vince, 2010 Jun 15. And another June 16.
second patch)
Also patch from Vince, 2010 Jun 15. And another June 16.
However: more generic patch on the way. However: more generic patch on the way.
- patch for conceal feature and 'modifiable'. (Dominique Pelle, 2010 Jun 9)
- undofile: keep markers where the file was written/read, so that it's easy to - undofile: keep markers where the file was written/read, so that it's easy to
go back to a saved version of the file: ":earlier 1f" (f for file)? go back to a saved version of the file: ":earlier 1f" (f for file)?
Also add ":earlier 1d" (d for day). Also add ":earlier 1d" (d for day).

15
src/option.c
View File

@@ -7334,12 +7334,21 @@ set_bool_option(opt_idx, varp, value, opt_flags)
#endif #endif
} }
#ifdef FEAT_TITLE #if defined(FEAT_TITLE) || defined(FEAT_CONCEAL)
/* when 'modifiable' is changed, redraw the window title */ /* when 'modifiable' is changed, redraw the window title and
* update current line for concealable items */
else if ((int *)varp == &curbuf->b_p_ma) else if ((int *)varp == &curbuf->b_p_ma)
{ {
# ifdef FEAT_TITLE
redraw_titles(); redraw_titles();
# endif
# ifdef FEAT_CONCEAL
if (curwin->w_p_conceal)
update_single_line(curwin, curwin->w_cursor.lnum);
# endif
} }
#endif
#ifdef FEAT_TITLE
/* when 'endofline' is changed, redraw the window title */ /* when 'endofline' is changed, redraw the window title */
else if ((int *)varp == &curbuf->b_p_eol) else if ((int *)varp == &curbuf->b_p_eol)
{ {
@@ -8443,7 +8452,7 @@ findoption(arg)
get_option_value(name, numval, stringval, opt_flags) get_option_value(name, numval, stringval, opt_flags)
char_u *name; char_u *name;
long *numval; long *numval;
char_u **stringval; /* NULL when only checking existance */ char_u **stringval; /* NULL when only checking existence */
int opt_flags; int opt_flags;
{ {
int opt_idx; int opt_idx;

2
src/screen.c
View File

@@ -595,7 +595,7 @@ update_single_line(wp, lnum)
int j; int j;
if (lnum >= wp->w_topline && lnum < wp->w_botline if (lnum >= wp->w_topline && lnum < wp->w_botline
&& foldedCount(wp, lnum, NULL) == 0) && foldedCount(wp, lnum, &win_foldinfo) == 0)
{ {
# ifdef FEAT_GUI # ifdef FEAT_GUI
/* Remove the cursor before starting to do anything, because scrolling /* Remove the cursor before starting to do anything, because scrolling