aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

Add the 'c' flag to 'concealcursor'.

Browse Source
This commit is contained in:
Bram Moolenaar
2010-07-24 15:00:38 +02:00
parent f691b84fba
commit ca8c9867c2
6 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/doc/options.txt
View File

@@ -1,4 +1,4 @@
*options.txt* For Vim version 7.3b. Last change: 2010 Jul 23
*options.txt* For Vim version 7.3b. Last change: 2010 Jul 24
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1719,8 +1719,9 @@ A jump table for the options with a short description can be found at |Q_op|.
n Normal mode
v Visual mode
i Insert mode
c Command line editing, for 'incsearch'
A useful value is "n". This is used in help files. So long as you
A useful value is "nc". This is used in help files. So long as you
are moving around text is concealed, but when starting to insert text
or selecting a Visual area the concealed text is displayed, so that
you can see what you are doing.

11
runtime/doc/todo.txt
View File

@@ -32,12 +32,15 @@ be worked on, but only if you sponsor Vim development. See |sponsor|.
Check position in wrapped line with 'concealcursor' set.
Patch for :find completion. (Nazri Ramliy)
But I prefer to keep term.h and include/term.h
Trick with syntax ID works, but it's not nice. Can we give a sequence nr to
syntax item matches? At least the ones with a replacement char.
'undoreload' option: when fewer lines than these consider a reload as a change
action and save the text before the reload, don't clear undo info.
Patch for :find completion. (Nazri Ramliy)
But I prefer to keep term.h and include/term.h He will work on it.
'fenc' in modeline problem: add option to reload the file when 'fenc' is set
to a different value in a modeline? Option can be default on.
Could be done with an autocommand?
@@ -73,6 +76,8 @@ accented character. (Tony Mechelynck, 2010 Apr 15)
Better Czech keymap. (Stepnem, 2010 May 4) Use if no response from Jiri
Tobisek.
":drop" does not respect 'autochdir'. (Peter Odding, 2010 Jul 24)
Use Dutch spell files from:
http://extensions.services.openoffice.org/en/project/dict-nl
Looks like this is newer than the new wordlist for Dutch:

4
runtime/doc/various.txt
View File

@@ -1,4 +1,4 @@
*various.txt* For Vim version 7.3b. Last change: 2010 Jul 21
*various.txt* For Vim version 7.3b. Last change: 2010 Jul 24
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -294,7 +294,7 @@ N *+cmdline_compl* command line completion |cmdline-completion|
N *+cmdline_hist* command line history |cmdline-history|
N *+cmdline_info* |'showcmd'| and |'ruler'|
N *+comments* |'comments'| support
m *+conceal* "conceal" support, see |conceal| |:syn-conceal| etc.
B *+conceal* "conceal" support, see |conceal| |:syn-conceal| etc.
N *+cryptv* encryption support |encryption|
B *+cscope* |cscope| support
m *+cursorbind* |'cursorbind'| support

2
runtime/ftplugin/help.vim
View File

@@ -13,7 +13,7 @@ set cpo&vim
let b:undo_ftplugin = "setl fo< tw< cole< cocu<"
setlocal formatoptions+=tcroql textwidth=78 cole=2 cocu=n
setlocal formatoptions+=tcroql textwidth=78 cole=2 cocu=nc
let &cpo = s:cpo_save
unlet s:cpo_save

2
src/option.h
View File

@@ -189,7 +189,7 @@
#define MOUSE_NONE ' ' /* don't use Visual selection */
#define MOUSE_NONEF 'x' /* forced modeless selection */
#define COCU_ALL "nvi" /* flags for 'concealcursor' */
#define COCU_ALL "nvic" /* flags for 'concealcursor' */
/* characters for p_shm option: */
#define SHM_RO 'r' /* readonly */

2
src/screen.c
View File

@@ -605,6 +605,8 @@ conceal_cursor_line(wp)
c = 'i';
else if (State & NORMAL)
c = 'n';
else if (State & CMDLINE)
c = 'c';
else
return FALSE;
return vim_strchr(wp->w_p_cocu, c) != NULL;