updated for version 7.0009v7.0009

7 files changed, 68 insertions, 19 deletions

diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 4d4a88c633..6f46033534 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.0aa.  Last change: 2004 Jul 01
+*cmdline.txt*   For Vim version 7.0aa.  Last change: 2004 Jul 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -164,6 +164,8 @@ CTRL-R CTRL-A				*c_CTRL-R_CTRL-A* *c_<C-R>_<C-A>*
 				'path' as in |gf|
 			CTRL-W	the Word under the cursor
 			CTRL-A	the WORD under the cursor; see |WORD|
+		When 'incsearch' is set the cursor position of the currently
+		displayed match is used.
 		{not in Vi}
 		CTRL-F and CTRL-P: {only when +file_in_path feature is
 		included}
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 1a28bf1794..be83ae181a 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2004 Jul 05
+*options.txt*	For Vim version 7.0aa.  Last change: 2004 Jul 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1104,6 +1104,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  nofile	buffer which is not related to a file and will not be
 			written
 	  nowrite	buffer which will not be written
+	  acwrite	buffer which will always be written with BufWriteCmd
+	  		autocommands. {not available when compiled without the
+			|+autocmd| feature}
 	  quickfix	quickfix buffer, contains list of errors |:cwindow|
 	  help		help buffer (you are not supposed to set this
 			manually)
@@ -1128,6 +1131,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 	nofile only:	The buffer name is fixed, it is not handled like a
 			file name.  It is not modified in response to a |:cd|
 			command.
+							*E676*
+	"acwrite" implies that the buffer name is not related to a file, like
+	"nofile", but it will be written.  Thus, in contrast to "nofile" and
+	"nowrite", ":w" does work and a modified buffer can't be abandoned
+	without saving.  For writing there must be matching |BufWriteCmd|,
+	|FileWriteCmd| or |FileAppendCmd| autocommands.
 
 						*'casemap'* *'cmp'*
 'casemap' 'cmp'		string	(default: "internal,keepascii")
@@ -3422,14 +3431,16 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not in Vi}
 			{not available when compiled without the
 			|+extra_search| feature}
-	While typing a search command, show immediately where the so far
-	typed pattern matches.  The matched string is highlighted.  If the
-	pattern is invalid or not found, nothing is shown.  The screen will
-	be updated often, this is only useful on fast terminals.  Note that
-	the match will be shown, but the cursor is not actually positioned
-	there.  You still need to finish the search command with <CR> to move
-	the cursor.  The highlighting can be set with the 'i' flag in
-	'highlight'.  See also: 'hlsearch'.
+	While typing a search command, show where the pattern, as it was typed
+	so far, matches.  The matched string is highlighted.  If the pattern
+	is invalid or not found, nothing is shown.  The screen will be updated
+	often, this is only useful on fast terminals.
+	Note that the match will be shown, but the cursor will return to its
+	original position when no match is found and when pressing <Esc>.  You
+	still need to finish the search command with <Enter> to move the
+	cursor to the match.
+	The highlighting can be set with the 'i' flag in 'highlight'.
+	See also: 'hlsearch'.
 	NOTE: This option is reset when 'compatible' is set.
 
 						*'indentexpr'* *'inde'*
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index c73d17e4be..5f3f9e97d3 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.0aa.  Last change: 2004 Jun 18
+*starting.txt*  For Vim version 7.0aa.  Last change: 2004 Jul 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -746,7 +746,7 @@ accordingly.  Vim proceeds in this order:
 		    "home:.vimrc"	(for Amiga) (*)
 		    "$VIM/.vimrc"	(for OS/2 and Amiga) (*)
 		    "$HOME/_vimrc"	(for MS-DOS and Win32) (*)
-		    "$VIM\_vimrc"	(for MS-DOS and Win32) (*)
+		    "$VIM/_vimrc"	(for MS-DOS and Win32) (*)
 		Note: For Unix, OS/2 and Amiga, when ".vimrc" does not exist,
 		"_vimrc" is also tried, in case an MS-DOS compatible file
 		system is used.  For MS-DOS and Win32 ".vimrc" is checked
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index c1e7de7076..d31122b917 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.0aa.  Last change: 2004 Jul 06
+*syntax.txt*	For Vim version 7.0aa.  Last change: 2004 Jul 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2089,6 +2089,14 @@ This will prevent highlighting of special identifiers like "ConstantName",
 "$global_var", "@instance_var", "| iterator |", and ":symbol".
 
 
+SCHEME						*scheme.vim* *scheme-syntax*
+
+By default only R5RS keywords are highlighted and properly indented.
+
+MzScheme-specific stuff will be used if b:is_mzscheme or g:is_mzscheme
+variables are defined.
+
+
 SDL						*sdl.vim* *sdl-syntax*
 
 The SDL highlighting probably misses a few keywords, but SDL has so many
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 597e307fcf..fe79d84d1d 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1813,6 +1813,8 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 :di	change.txt	/*:di*
 :diffg	diff.txt	/*:diffg*
 :diffget	diff.txt	/*:diffget*
+:diffo	diff.txt	/*:diffo*
+:diffoff	diff.txt	/*:diffoff*
 :diffp	diff.txt	/*:diffp*
 :diffpatch	diff.txt	/*:diffpatch*
 :diffpu	diff.txt	/*:diffpu*
@@ -3527,6 +3529,7 @@ E672	starting.txt	/*E672*
 E673	print.txt	/*E673*
 E674	print.txt	/*E674*
 E675	print.txt	/*E675*
+E676	options.txt	/*E676*
 E68	pattern.txt	/*E68*
 E69	pattern.txt	/*E69*
 E70	pattern.txt	/*E70*
@@ -5424,8 +5427,12 @@ netbeans.txt	netbeans.txt	/*netbeans.txt*
 netrw	pi_netrw.txt	/*netrw*
 netrw--	pi_netrw.txt	/*netrw--*
 netrw-D	pi_netrw.txt	/*netrw-D*
+netrw-H	pi_netrw.txt	/*netrw-H*
+netrw-M	pi_netrw.txt	/*netrw-M*
+netrw-R	pi_netrw.txt	/*netrw-R*
 netrw-activate	pi_netrw.txt	/*netrw-activate*
 netrw-browse	pi_netrw.txt	/*netrw-browse*
+netrw-browse-cmds	pi_netrw.txt	/*netrw-browse-cmds*
 netrw-browse-var	pi_netrw.txt	/*netrw-browse-var*
 netrw-c-l	pi_netrw.txt	/*netrw-c-l*
 netrw-cadaver	pi_netrw.txt	/*netrw-cadaver*
@@ -5439,9 +5446,9 @@ netrw-ex	pi_netrw.txt	/*netrw-ex*
 netrw-file	pi_netrw.txt	/*netrw-file*
 netrw-fixup	pi_netrw.txt	/*netrw-fixup*
 netrw-ftp	pi_netrw.txt	/*netrw-ftp*
-netrw-h	pi_netrw.txt	/*netrw-h*
 netrw-help	pi_netrw.txt	/*netrw-help*
 netrw-history	pi_netrw.txt	/*netrw-history*
+netrw-i	pi_netrw.txt	/*netrw-i*
 netrw-list	pi_netrw.txt	/*netrw-list*
 netrw-list-hack	pi_netrw.txt	/*netrw-list-hack*
 netrw-move	pi_netrw.txt	/*netrw-move*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index e19f86c506..fa1ddffd2c 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2004 Jul 12
+*todo.txt*      For Vim version 7.0aa.  Last change: 2004 Jul 16
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,13 +30,15 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Make aap build script work again. Also with mzscheme
+When switching between Aap script and make Vim won't always run.
 
 Mac: Compiling --enable-gui=athena doesn't work.  Try to fix without disabling
-Carbon.  Otherwise adjust configure to disable darwin. (raf)
+Carbon.  Otherwise adjust configure to disable Darwin. (raf)
 
-Mac: "make install" doesn't install.
+Mac: "make install" doesn't install.  Patch from RAF.
 
+UTF-8 in 'comments' causes wrong indent.  Counting bytes instead of char
+width? (Nikolai Weibull)
 
 For version 7.0:
 -   Include many PATCHES:
@@ -282,6 +284,9 @@ For version 7.0:
     line.
 7   Make ":startinsert" command work directly for functions and scripts?
     Also make it possible to append (it's difficult at end of line).
+-   When using 'incsearch" CTRL-R CTRL-W gets the word under the cursor, but
+    the part that already matched is doubled then.  Remove the part of the
+    word that would be doubled.  Make it work line CTRL-N in Insert mode.
 
 Vi incompatibility:
 8   With undo/redo only marks in the changed lines should be changed.  Other
@@ -1995,6 +2000,8 @@ Autocommands:
     CmdEnter	    - Entering Cmdline mode
     VisualEnter	    - Entering Visual mode
     *Leave	    - Leaving a mode (in pair with the above *Enter)
+    VimLeaveCheck    - Before Vim decides to exit, so that it can be cancelled
+		      when exiting isn't a good idea.
     CmdUndefined    - Like FuncUndefined but for user commands.
     SearchPost	    - After doing a search command (e.g. to do "M")
     PreDirChanged/PostDirChanged
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index fd9335f9b7..a1c902cf2c 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2004 Jul 11
+*version7.txt*  For Vim version 7.0aa.  Last change: 2004 Jul 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -170,6 +170,10 @@ it. (Johannes Zellner)
 
 Added "nbsp" in 'listchars'. (David Blanchet)
 
+Added the "acwrite" value for the 'buftype' option.  This is for a buffer that
+doesn not have a name that refers to a file and is written with BufWriteCmd
+autocommands.
+
 For lisp indenting and matching parenthesis: (Sergey Khorev)
 - square brackets are recognized properly
 - #\(, #\), #\[ and #\] are recognized as character literals
@@ -241,4 +245,14 @@ ignored.  ":echo '-05' + 0" resulted in 5 instead of -5.
 Using "@:" to repeat a command line didn't work when it contains control
 characters.
 
+When using file completion for a user command, it would not expand environment
+variables like for a regular command with a file argument.
+
+'cindent': When the argument of a #define looks like a C++ class the next line
+is indented too much.
+
+When 'comments' includes multi-byte characters inserting the middle part and
+alignment may go wrong.  'cindent' also suffers from this for right-aligned
+items.
+
  vim:tw=78:ts=8:ft=help:norl: