commit c400cb9ca7dbd88a6c0ae678c7e04e54311d552d
author Bram Moolenaar <Bram@vim.org> Mon Jul 19 19:52:13 2010 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Jul 19 19:52:13 2010 +0200
tree 61177f3c62264dca07df5d8a9e2947450c0082b8
parent 01a8f38fcd469db0360b896cb670b889619d3752

Rename w_p_conceal to w_p_conc for consistency.

src/option.c

diff --git a/src/option.c b/src/option.c
index 80eb942..27a82fd 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7442,7 +7442,7 @@
 	redraw_titles();
 # endif
 # ifdef FEAT_CONCEAL
-	if (curwin->w_p_conceal)
+	if (curwin->w_p_conc > 0)
 	    update_single_line(curwin, curwin->w_cursor.lnum);
 # endif
     }
@@ -8232,17 +8232,17 @@
 	    ml_open_files();
     }
 #ifdef FEAT_CONCEAL
-    else if (pp == &curwin->w_p_conceal)
+    else if (pp == &curwin->w_p_conc)
     {
-	if (curwin->w_p_conceal < 0)
+	if (curwin->w_p_conc < 0)
 	{
 	    errmsg = e_positive;
-	    curwin->w_p_conceal = 0;
+	    curwin->w_p_conc = 0;
 	}
-	else if (curwin->w_p_conceal > 3)
+	else if (curwin->w_p_conc > 3)
 	{
 	    errmsg = e_invarg;
-	    curwin->w_p_conceal = 3;
+	    curwin->w_p_conc = 3;
 	}
     }
 #endif
@@ -9506,7 +9506,7 @@
 	case PV_CRBIND: return (char_u *)&(curwin->w_p_crb);
 #endif
 #ifdef FEAT_CONCEAL
-	case PV_CONCEAL:    return (char_u *)&(curwin->w_p_conceal);
+	case PV_CONCEAL:    return (char_u *)&(curwin->w_p_conc);
 #endif
 
 	case PV_AI:	return (char_u *)&(curbuf->b_p_ai);