Rename w_p_conceal to w_p_conc for consistency.

diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt
index d7127da38881ba9e79c4bb36210efd9bf88dcf15..d122521f8c5acb31b2ac8c41230612e0fad29f89 100644 (file)
--- a/runtime/doc/mlang.txt
+++ b/runtime/doc/mlang.txt
@@ -58,8 +58,10 @@ use of "-" and "_".
                        The locale {name} must be a valid locale on your
                        system.  Some systems accept aliases like "en" or
                        "en_US", but some only accept the full specification
-                       like "en_US.ISO_8859-1".
-                       With the "messages" argument the language used for
+                       like "en_US.ISO_8859-1".  On Unix systems you can use
+                       the this command to see what locales are supported: >
+                               :!locale -a
+<                      With the "messages" argument the language used for
                        messages is set.  This can be different when you want,
                        for example, English messages while editing Japanese
                        text.  This sets $LC_MESSAGES.

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index cae009f14ae4e01660bd97c6b152f1c94f072ffa..cbf0994137f83962971f8e51b23b334fad1fd07c 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1724,7 +1724,9 @@ A jump table for the options with a short description can be found at |Q_op|.
        2               Concealed text is completely hidden unless it has a
                        custom replacement character defined (see
                        |:syn-cchar|.
-       3               Concealed text is completely hidden.
+       3               Concealed text is completely hidden.  Note: when
+                       moving the cursor after concealed items the position
+                       will be wrong.
 
 
                                *'confirm'* *'cf'* *'noconfirm'* *'nocf'*

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index d2db68a5580d90fa619e5e2870bb487b4bb2df05..1106927db633719c4d4c151e80fb6bf02b00461f 100644 (file)
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -34,6 +34,11 @@ Update syntax menus: run checkmenu.
 
 GTK: torn-off menu doesn't work.
 
+:find completion has duplicates. (Bjorn Winckler, 2010 Jul 18)
+
+Conceal: don't show for 'hlmatch' when 'modifiable' is off?
+And don't care about 'cursorline'.
+
 Make 'cryptmethod' global-local, so that a default specified in a .vimrc file
 is used for new files. (Christian J. Robinson)
 
@@ -2325,6 +2330,7 @@ Spell checking:
 Diff mode:
 9   Instead invoking an external diff program, use builtin code.  One can be
     found here: http://www.ioplex.com/~miallen/libmba/dl/src/diff.c
+    It's quite big and badly documented though.
 8   Use diff mode to show the changes made in a buffer (compared to the file).
     Use an unnamed buffer, like doing:
        new | set bt=nofile | r # | 0d_ | diffthis | wincmd p | diffthis
@@ -3929,8 +3935,6 @@ Undo:
     storing the differences.
     Alternative: before reloading a buffer, store it somewhere.  Keep a list
     of about 10 last reloaded buffers.
-    OR: before unloading, write a backup file with the current text, as if
-    doing ":w" twice before reloading.
 -   Make it possible to undo all the commands from a mapping, including a
     trailing unfinished command, e.g. for ":map K iX^[r".
 -   When accidentally hitting "R" instead of Ctrl-R, further Ctrl-R is not

diff --git a/src/edit.c b/src/edit.c
index e5f6b3312b0efd35707e04260f464d4ab386c73a..87fd5696cfe96d61c5ffc3eb93d6396e30d0c887 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -1476,7 +1476,7 @@ ins_redraw(ready)
                    ||
 # endif
 # ifdef FEAT_CONCEAL
-                   curwin->w_p_conceal
+                   curwin->w_p_conc > 0
 # endif
                    )
            && !equalpos(last_cursormoved, curwin->w_cursor)
@@ -1498,7 +1498,7 @@ ins_redraw(ready)
                apply_autocmds(EVENT_CURSORMOVEDI, NULL, NULL, FALSE, curbuf);
 # endif
 # ifdef FEAT_CONCEAL
-           if (curwin->w_p_conceal)
+           if (curwin->w_p_conc > 0)
            {
                conceal_old_cursor_line = last_cursormoved.lnum;
                conceal_new_cursor_line = curwin->w_cursor.lnum;

diff --git a/src/gui.c b/src/gui.c
index 68999926f6d382f859c28f5310c0f0f7539eb0db..c8993232067ea33161f34c2ff57a486ec2536119 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -4922,7 +4922,7 @@ gui_update_screen()
                ||
 # endif
 # ifdef FEAT_CONCEAL
-               curwin->w_p_conceal
+               curwin->w_p_conc > 0
 # endif
                )
                     && !equalpos(last_cursormoved, curwin->w_cursor))
@@ -4932,7 +4932,7 @@ gui_update_screen()
            apply_autocmds(EVENT_CURSORMOVED, NULL, NULL, FALSE, curbuf);
 # endif
 # ifdef FEAT_CONCEAL
-       if (curwin->w_p_conceal)
+       if (curwin->w_p_conc > 0)
        {
            conceal_old_cursor_line = last_cursormoved.lnum;
            conceal_new_cursor_line = curwin->w_cursor.lnum;

diff --git a/src/main.c b/src/main.c
index cce99cd1319d074f257dc594b09922c2b4aa300e..029b64c76eebdc193d43be598e0c535f863714ca 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1098,7 +1098,7 @@ main_loop(cmdwin, noexmode)
                        ||
 # endif
 # ifdef FEAT_CONCEAL
-                       curwin->w_p_conceal
+                       curwin->w_p_conc > 0
 # endif
                        )
                 && !equalpos(last_cursormoved, curwin->w_cursor))
@@ -1109,7 +1109,7 @@ main_loop(cmdwin, noexmode)
                                                               FALSE, curbuf);
 # endif
 # ifdef FEAT_CONCEAL
-               if (curwin->w_p_conceal)
+               if (curwin->w_p_conc > 0)
                {
                    conceal_old_cursor_line = last_cursormoved.lnum;
                    conceal_new_cursor_line = curwin->w_cursor.lnum;

diff --git a/src/normal.c b/src/normal.c
index 055916711d5ee4933d2a4c455f80a8efd32caab6..4d2f4c6547663ca79d423d08f6cf18af726b4c4e 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -8296,7 +8296,7 @@ n_opencmd(cap)
                    0, 0))
        {
 #ifdef FEAT_CONCEAL
-           if (curwin->w_p_conceal && oldline != curwin->w_cursor.lnum)
+           if (curwin->w_p_conc > 0 && oldline != curwin->w_cursor.lnum)
                update_single_line(curwin, oldline);
 #endif
            /* When '#' is in 'cpoptions' ignore the count. */

diff --git a/src/option.c b/src/option.c
index 80eb9424c7eb52ad9f5c89f72136a1266bdf80ff..27a82fde20aa847d378d83b8ab429e138764a447 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -7442,7 +7442,7 @@ set_bool_option(opt_idx, varp, value, opt_flags)
        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 @@ set_num_option(opt_idx, varp, value, errbuf, errbuflen, opt_flags)
            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 @@ get_varp(p)
        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);

diff --git a/src/screen.c b/src/screen.c
index 508e627058e435f05e99c6346387e8a3fb82bcb3..7d6985a8a8b7f59a30620e866d11eb21a9933b34 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -2776,7 +2776,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
 #ifdef FEAT_CONCEAL
     int                syntax_flags    = 0;
     int                conceal_attr    = hl_attr(HLF_CONCEAL);
-    int                first_conceal   = (wp->w_p_conceal != 3);
+    int                first_conceal   = (wp->w_p_conc != 3);
     int                is_concealing   = FALSE;
     int                boguscols       = 0;    /* nonexistent columns added to force
                                           wrapping */
@@ -4377,7 +4377,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
            }
 
 #ifdef FEAT_CONCEAL
-           if (    wp->w_p_conceal
+           if (    wp->w_p_conc > 0
                    && !area_highlighting
                    && (lnum != wp->w_cursor.lnum
                        || curwin != wp || wp->w_buffer->b_p_ma == FALSE)
@@ -4386,7 +4386,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
            {
                char_attr = conceal_attr;
                if (first_conceal
-                       && (syn_get_sub_char() != NUL || wp->w_p_conceal == 1))
+                       && (syn_get_sub_char() != NUL || wp->w_p_conc == 1))
                {
                    if (syn_get_sub_char() != NUL)
                        c = syn_get_sub_char();
@@ -4437,8 +4437,8 @@ win_line(wp, lnum, startrow, endrow, nochange)
            }
            else
            {
-               first_conceal   = (wp->w_p_conceal != 3);
-               is_concealing   = FALSE;
+               first_conceal = (wp->w_p_conc != 3);
+               is_concealing = FALSE;
            }
 #endif /* FEAT_CONCEAL */
        }
@@ -4909,7 +4909,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
            }
        }
 #ifdef FEAT_CONCEAL
-       else if (wp->w_p_conceal > 0 && is_concealing)
+       else if (wp->w_p_conc > 0 && is_concealing)
        {
            --n_skip;
            ++vcol_off;

diff --git a/src/structs.h b/src/structs.h
index e0f9f3bef9fd230af8e16687334298512c90ec82..ebcc3cffed8d7eb4a7d19d0c7581c4c11e63859a 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -216,8 +216,8 @@ typedef struct
     int                wo_wrap;
 #define w_p_wrap w_onebuf_opt.wo_wrap  /* 'wrap' */
 #ifdef FEAT_CONCEAL
-    long       wo_conceal;             /* 'conceal' */
-# define w_p_conceal w_onebuf_opt.wo_conceal
+    long       wo_conc;                /* 'conceal' */
+# define w_p_conc w_onebuf_opt.wo_conc
 #endif
 #ifdef FEAT_CURSORBIND
     int                wo_crb;

diff --git a/src/undo.c b/src/undo.c
index 7abd67b2b33e9973d8fdeed9d3272c85ebef20dd..5ebf0e7b18cc5759fe8d42296fcaf234a9640cb8 100644 (file)
--- a/src/undo.c
+++ b/src/undo.c
@@ -2710,7 +2710,7 @@ u_undo_end(did_undo, absolute)
 
        FOR_ALL_WINDOWS(wp)
        {
-           if (wp->w_buffer == curbuf && wp->w_p_conceal)
+           if (wp->w_buffer == curbuf && wp->w_p_conc > 0)
                redraw_win_later(wp, NOT_VALID);
        }
     }