Mercurial > vim
changeset 2348:8878a9f8db87 vim73
Rename w_p_conceal to w_p_conc for consistency.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Mon, 19 Jul 2010 19:52:13 +0200 |
| parents | 9228765d3e13 |
| children | 586a459f3980 |
| files | runtime/doc/mlang.txt runtime/doc/options.txt runtime/doc/todo.txt src/edit.c src/gui.c src/main.c src/normal.c src/option.c src/screen.c src/structs.h src/undo.c |
| diffstat | 11 files changed, 38 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1724,7 +1724,9 @@ A jump table for the options with a shor 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'*
--- 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 @@ 8 Add hl groups to 'spelllang'? 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 @@ 8 See ":e" as a change operation, find 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
--- 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;
--- 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;
--- 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;
--- 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. */
--- a/src/option.c +++ b/src/option.c @@ -7442,7 +7442,7 @@ set_bool_option(opt_idx, varp, value, op 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, err ml_open_files(); } #ifdef FEAT_CONCEAL - else if (pp == &curwin->w_p_conceal) - { - if (curwin->w_p_conceal < 0) + else if (pp == &curwin->w_p_conc) + { + if (curwin->w_p_conc < 0) { errmsg = e_positive; - curwin->w_p_conceal = 0; - } - else if (curwin->w_p_conceal > 3) + curwin->w_p_conc = 0; + } + 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);
--- a/src/screen.c +++ b/src/screen.c @@ -2776,7 +2776,7 @@ win_line(wp, lnum, startrow, endrow, noc #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, noc } #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, noc { 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, noc } 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, noc } } #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;
--- 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;