summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-06-22 05:16:38 +0200
committerBram Moolenaar <Bram@vim.org>2010-06-22 05:16:38 +0200
commit370df58df9bba97fd5dd6f00595b2f41efda8383 (patch)
tree21706b1cbe3258a7fbfc4e5aa7f4947d6d45253a /src
parent883f5d08e48e0e8b6d7bcade0cc48a36fc41931e (diff)
Couple of small fixes for conceal feature. (Dominique Pelle)
Diffstat (limited to 'src')
-rw-r--r--src/option.c15
-rw-r--r--src/screen.c2
2 files changed, 13 insertions, 4 deletions
diff --git a/src/option.c b/src/option.c
index face9fde99..fdca36f631 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7334,12 +7334,21 @@ set_bool_option(opt_idx, varp, value, opt_flags)
#endif
}
-#ifdef FEAT_TITLE
- /* when 'modifiable' is changed, redraw the window title */
+#if defined(FEAT_TITLE) || defined(FEAT_CONCEAL)
+ /* when 'modifiable' is changed, redraw the window title and
+ * update current line for concealable items */
else if ((int *)varp == &curbuf->b_p_ma)
{
+# ifdef FEAT_TITLE
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 */
else if ((int *)varp == &curbuf->b_p_eol)
{
@@ -8443,7 +8452,7 @@ findoption(arg)
get_option_value(name, numval, stringval, opt_flags)
char_u *name;
long *numval;
- char_u **stringval; /* NULL when only checking existance */
+ char_u **stringval; /* NULL when only checking existence */
int opt_flags;
{
int opt_idx;
diff --git a/src/screen.c b/src/screen.c
index 1753330345..f2108be23f 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -595,7 +595,7 @@ update_single_line(wp, lnum)
int j;
if (lnum >= wp->w_topline && lnum < wp->w_botline
- && foldedCount(wp, lnum, NULL) == 0)
+ && foldedCount(wp, lnum, &win_foldinfo) == 0)
{
# ifdef FEAT_GUI
/* Remove the cursor before starting to do anything, because scrolling