Add the 'c' flag to 'concealcursor'.

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c54927479cd4c9350ab0b4864f016baaf3f90858..09e9ab352c9a45d9e547728474e6cc8b6fee5bbd 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -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.

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 87ed10817c69713cfe885e8dc20a794aa8dd805c..9604e32a01b230bf5127943386138d653e3a53fa 100644 (file)
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -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:

diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 5f898f1916f430e5b6ef991be6f75251197c511f..6eb9b2bd6b09290273238c7ff038b39788fbb917 100644 (file)
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -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

diff --git a/runtime/ftplugin/help.vim b/runtime/ftplugin/help.vim
index fff952712796f61c9f145087175f08e716e5456d..fdac41064dc55b5723b67050d1677edf0a523224 100644 (file)
--- a/runtime/ftplugin/help.vim
+++ b/runtime/ftplugin/help.vim
@@ -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

diff --git a/src/option.h b/src/option.h
index 216446748fe957da4a5553f1d7b5cfa0d2e8bd37..5e8574d828da411a139da53d9c40dfd1ef61a483 100644 (file)
--- a/src/option.h
+++ b/src/option.h
@@ -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 */

diff --git a/src/screen.c b/src/screen.c
index 70805d5214f984d63d79ed237c39c72de8654038..1756fc0b2b72f1b9b86f41e9cb8c6c9e0eb46f10 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -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;