Make updating text for conceal mode simpler. A few compiler warning fixes.

5 files changed, 23 insertions, 20 deletions

diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index a8a6410d53..7068943251 100644
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -168,6 +168,7 @@ HTMLS = \
 	gui_x11.html \
 	hangulin.html \
 	hebrew.html \
+	helphelp.html \
 	howto.html \
 	if_cscop.html \
 	if_mzsch.html \
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index da56816436..743c712df3 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1352,6 +1352,7 @@ The commands are sorted on the non-optional part of their name.
 |:options|	:opt[ions]	open the options-window
 |:ounmap|	:ou[nmap]	like ":unmap" but for Operator-pending mode
 |:ounmenu|	:ounme[nu]	remove menu for Operator-pending mode
+|:ownsyntax|	:ow[nsyntax]	set new local syntax highlight for this window
 |:pclose|	:pc[lose]	close preview window
 |:pedit|	:ped[it]	edit file in the preview window
 |:perl|		:pe[rl]		execute Perl command
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 96c5cfbb52..09336cda63 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -647,6 +647,7 @@ Short explanation of each option:		*option-list*
 'complete'	  'cpt'     specify how Insert mode completion works
 'completefunc'	  'cfu'     function to be used for Insert mode completion
 'completeopt'	  'cot'     options for Insert mode completion
+'conceallevel'	  'conc'    whether concealable text is shown or hidden 
 'confirm'	  'cf'	    ask what to do about unsaved/read-only files
 'conskey'	  'consk'   get keys directly from console (MS-DOS only)
 'copyindent'	  'ci'	    make 'autoindent' use existing indent structure
@@ -658,6 +659,7 @@ Short explanation of each option:		*option-list*
 'cscopetag'       'cst'     use cscope for tag commands
 'cscopetagorder'  'csto'    determines ":cstag" search order
 'cscopeverbose'   'csverb'  give messages when adding a cscope database
+'cursorbind'	  'crb'     move cursor in window as it moves in other windows
 'cursorcolumn'	  'cuc'	    highlight the screen column of the cursor
 'cursorline'	  'cul'	    highlight the screen line of the cursor
 'debug'			    set to "msg" to see all error messages
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 35fbdd9fe1..fe515e22f9 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1682,6 +1682,7 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 32.1	usr_32.txt	/*32.1*
 32.2	usr_32.txt	/*32.2*
 32.3	usr_32.txt	/*32.3*
+32.4	usr_32.txt	/*32.4*
 40.1	usr_40.txt	/*40.1*
 40.2	usr_40.txt	/*40.2*
 40.3	usr_40.txt	/*40.3*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index a0675ec0de..d6f6c12073 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -30,11 +30,16 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+Bug in undo, using freed memory. (Dominique Pelle, Jul 1)
+
 Cursor positioning wrong with 0x200e character. (John Becket, 2010 May 6)
 
 E315 when trying to change a file in FileChangedRO autocommand event.
 (Dominique Pelle, 2010 Apr 30)
 
+Bug: searching for tags file uses 'suffixesadd', should not happen. (Dominique
+Pelle, 2010 June 28)
+
 When directory "/tmp/tags" contains "tags1" and "tags2", setting 'tags' to
 "/tmp/tags/*" doesn't pick up these files.  (Simon Ruggier, 2010 Mar 17)
 
@@ -74,6 +79,9 @@ Looks like only bash can do it. (Yakov Lerner)
 Need for CursorHold that retriggers.  Use a key that doesn't do anything, or a
 function that resets did_cursorhold.
 
+Cscope "cs add" stopped working somewhat before 7.2.438. (Gary Johnson, 2010
+Jun 29)  Caused by 7.2.433?
+
 I often see pasted text (from Firefox, to Vim in xterm) appear twice.
 Also, Vim in xterm sometimes loses copy/paste ability (probably after running
 an external command).
@@ -984,8 +992,6 @@ visible.
 GTK: when setting 'columns' in a startup script and doing ":vertical diffsplit"
 the window isn't redrawn properly, see two vertical bars.
 
-GTK: file chooser is disabled.  Patch by Tim Starling, 2009 Nov 13.
-
 The magic clipboard format "VimClipboard2" appears in several places.  Should
 be only one.
 
@@ -1083,16 +1089,17 @@ When switching between windows the cursor is often put in the middle.
 Remember the relative position and restore that, just like lnum and col are
 restored. (Luc St-Louis)
 
+Patch to support horizontal scroll wheel in GTK. Untested. (Bjorn Winckler,
+2010 Jun 30)
+
 
 Vim 7.3:
 - using NSIS 2.46: install on Windows 7 works, but no "Edit with Vim" menu.
    Use register_shell_extension()?
    Patch from Geoffrey Reilly, 2010 Jun 22
-- Patch for conceal feature from Vince, 2010 June 16.
-  Needs some more testing, better patch is coming.
-- implement ":earlier 1f" (f for file)?
-  Also add ":earlier 1d" (d for day).
-  Something like changenr() to see the "file saved" marker?
+- Patch for conceal feature from Vince, 2010 Jul 1.
+    fix insert mode, cursor up/down?
+    CTRL-O j doesn't trigger cursormoved event?
 - in August remove UF_VERSION_CRYPT_PREV and UF_VERSION_PREV.
 Patches to include:
 - Patch for Lisp support with ECL (Mikael Jansson, 2008 Oct 25)
@@ -1102,8 +1109,11 @@ Patches to include:
 - Patch to support :browse for more commands. (Lech Lorens, 2009 Jul 18)
 - Patch to improve javascript indenting. (Hari Kumar G, 2010 May 22)
 - Patch to use return value of 'formatexpr'. (James Vega, 2010 Jun 16)
+- Patch for gtk main_loop() to enable GtkFileChooser. (James Vega, 2010 Jun 28)
+    Same as this one?  GTK: file chooser is disabled.  Patch by Tim Starling,
+    2009 Nov 13.
 - Patch to make CTRL-L work better with 'ignorecase' and 'smarcase'. (Martin
-  Toft, 2010 Jun 8, Jun 16)
+  Toft, 2010 Jun 8, Jun 16, Jun 30)
 - Patch to add diff functionality to 2html.vim. (Christian Brabandt, 2009 Dec
   15)
 - Win32: patch for better font scaling. (George Reilly, 2009 Mar 26) 
@@ -1356,16 +1366,6 @@ Vi incompatibility:
     thing.  (only repeat insert for the first line).
 
 
-GTK+ 1 (OK in GTK 2):
-8   When using "gvim -geom 40x30" or setting 'columns' in .gvimrc or with a
-    GUIEnter autocommand, the width is still set to fit the toolbar.  Also
-    happens when changing the font.  How to avoid that the toolbar specifies
-    the minimal window width?
-8   When using a theme with different scrollbars (gtkstep), the scrollbars can
-    be too narrow. (Drazen Kacar)
-8   Font "7x14" has a bold version "7x14bold".  Try to find the bold font by
-    appending "bold" when there are not 14 dashes.
-
 GTK+ GUI known bugs:
 9   Crash with X command server over ssh. (Ciaran McCreesh, 2006 Feb 6)
 8   GTK 2: Combining UTF-8 characters not displayed properly in menus (Mikolaj
@@ -2433,8 +2433,6 @@ Folding:
 	edit version.c
     Can editing version.c twice be avoided?
 -   'foldmethod' "textobject": fold on sections and paragraph text objects.
--   Add 'hidecomment' option: don't display comments in /* */ and after //.
-    Or is the conceal patch from Vince Negri a more generic solution?
 -   "zuf": undo change in manual fold. "zUf" redo change in manual fold.  How
     to implement this?
 -   "zJ" command: add the line or fold below the fold in the fold under the