updated for version 7.0014

59 files changed, 3077 insertions, 1722 deletions

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 2e3a47bd92..14605e80f3 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.0aa.  Last change: 2004 Jul 01
+*autocmd.txt*   For Vim version 7.0aa.  Last change: 2004 Aug 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -24,10 +24,10 @@ For a basic explanation, see section |40.3| in the user manual.
 ==============================================================================
 1. Introduction						*autocmd-intro*
 
-You can specify commands to be executed automatically for when reading or
-writing a file, when entering or leaving a buffer or window, and when exiting
-Vim.  For example, you can create an autocommand to set the 'cindent' option
-for files matching *.c.  You can also use autocommands to implement advanced
+You can specify commands to be executed automatically when reading or writing
+a file, when entering or leaving a buffer or window, and when exiting Vim.
+For example, you can create an autocommand to set the 'cindent' option for
+files matching *.c.  You can also use autocommands to implement advanced
 features, such as editing compressed files (see |gzip-example|).  The usual
 place to put autocommands is in your .vimrc or .exrc file.
 
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 4f56dfe2fd..42fa8ba4e1 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.0aa.  Last change: 2004 Jul 04
+*editing.txt*   For Vim version 7.0aa.  Last change: 2004 Aug 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -29,16 +29,26 @@ Editing a file with Vim means:
 							*current-file*
 As long as you don't write the buffer, the original file remains unchanged.
 If you start editing a file (read a file into the buffer), the file name is
-remembered as the "current file name".
+remembered as the "current file name".  This is also known as the name of the
+current buffer.
 
 							*alternate-file*
 If there already was a current file name, then that one becomes the alternate
-file name.  All file names are remembered in the file list.  When you enter a
-file name, for editing (e.g., with ":e filename") or writing (e.g., with (:w
-file name"), the file name is added to the list.  You can use this list to
-remember which files you edited and to quickly switch from one file to
-another with the CTRL-^ command (e.g., to copy text).  First type the number
-of the file and then hit CTRL-^.  {Vi: only one alternate file name}
+file name.  It can later be used with "#" on the command line |:_#|.  However,
+the alternate file name is not changed when |:keepalt| is used.
+
+							*:keepalt* *:keepa*
+:keepalt {cmd}		Execute {cmd} while keeping the current alternate file
+			name.  Note that commands invoked indirectly (e.g.,
+			with a function) may still set the alternate file
+			name.  {not in Vi}
+
+All file names are remembered in the file list.  When you enter a file name,
+for editing (e.g., with ":e filename") or writing (e.g., with (:w file name"),
+the file name is added to the list.  You can use this list to remember which
+files you edited and to quickly switch from one file to another with the
+CTRL-^ command (e.g., to copy text).  First type the number of the file and
+then hit CTRL-^.  {Vi: only one alternate file name}
 
 CTRL-G		or				*CTRL-G* *:f* *:fi* *:file*
 :f[ile]			Prints the current file name (as typed), the
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index c277ddea89..0b757f3819 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2004 Jul 25
+*eval.txt*      For Vim version 7.0aa.  Last change: 2004 Aug 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -2231,8 +2231,9 @@ remote_read({serverid})				*remote_read()*
 <
 							*remote_send()* *E241*
 remote_send({server}, {string} [, {idvar}])
-		Send the {string} to {server}.  The string is sent as
-		input keys and the function returns immediately.
+		Send the {string} to {server}.  The string is sent as input
+		keys and the function returns immediately.  At the Vim server
+		the keys are not mapped |:map|.
 		If {idvar} is present, it is taken as the name of a
 		variable and a {serverid} for later use with
 		remote_read() is stored there.
@@ -2558,6 +2559,7 @@ strridx({haystack}, {needle})				*strridx()*
 		{haystack}. The search is done case-sensitive. For advanced
 		searches use |match()|.
 		If the {needle} does not occur in {haystack} it returns -1.
+		If the {needle} is empty the length of {haystack} is returned.
 		See also |stridx()|. Examples: >
 		  :echo strridx("an angry armadillo", "an")	     3
 <
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 21c48d3cd2..a4cc593a2a 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 7.0aa.  Last change: 2004 Jun 24
+*filetype.txt*  For Vim version 7.0aa.  Last change: 2004 Aug 31
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -82,6 +82,9 @@ You can disable it again with: >
 The filetype detection is not switched off then.  But if you do switch off
 filetype detection, the indent files will not be loaded either.
 This actually loads the file "indoff.vim" in 'runtimepath'.
+This disables auto-indenting for files you will open.  It will keep working in
+already opened files.  Reset 'autoindent', 'cindent', 'smartindent' and/or
+'indentexpr' to disable indenting in an opened file.
 
 						*:filetype-off*
 To disable file type detection, use this command: >
@@ -147,7 +150,7 @@ is used.  The default value is set like this: >
 This means that the contents of compressed files are not inspected.
 
 							*new-filetype*
-If a file type that you want to use is not detected yet, there are three ways
+If a file type that you want to use is not detected yet, there are four ways
 to add it.  In any way, it's better not to modify the $VIMRUNTIME/filetype.vim
 file.  It will be overwritten when installing a new version of Vim.
 
@@ -155,7 +158,7 @@ A. If you want to overrule all default file type checks.
    This works by writing one file for each filetype.  The disadvantage is that
    means there can be many files.  The advantage is that you can simply drop
    this file in the right directory to make it work.
-
+							*ftdetect*
    1. Create your user runtime directory.  You would normally use the first
       item of the 'runtimepath' option.  Then create the directory "ftdetect"
       inside it.  Example for Unix: >
diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt
index 882cd6a853..0d627daa6b 100644
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 7.0aa.  Last change: 2004 May 01
+*if_perl.txt*   For Vim version 7.0aa.  Last change: 2004 Aug 30
 
 
 		  VIM REFERENCE MANUAL    by Sven Verdoolaege
@@ -156,6 +156,8 @@ VIM::Buffers([{bn}...])	With no arguments, returns a list of all the buffers
 			numbers {bn}, returns a list of the buffers matching
 			{bn}, using the same rules as Vim's internal
 			|bufname()| function.
+			WARNING: the list becomes invalid when |:bwipe| is
+			used.  Using it anyway may crash Vim.
 
 							*perl-Windows*
 VIM::Windows([{wn}...])	With no arguments, returns a list of all the windows
@@ -163,6 +165,8 @@ VIM::Windows([{wn}...])	With no arguments, returns a list of all the windows
 			in a scalar context.  For a list of window numbers
 			{wn}, returns a list of the windows with those
 			numbers.
+			WARNING: the list becomes invalid when a window is
+			closed.  Using it anyway may crash Vim.
 
 							*perl-DoCommand*
 VIM::DoCommand({cmd})	Executes Ex command {cmd}.
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index fd94d326a6..5fc7b06fb9 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 7.0aa.  Last change: 2004 Jul 07
+*indent.txt*    For Vim version 7.0aa.  Last change: 2004 Sep 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -519,4 +519,15 @@ In addition, you can turn the verbose mode for debug issue: >
 
 Make sure to do ":set cmdheight=2" first to allow the display of the message.
 
+
+VIM							*vim-indent*
+
+For indenting Vim scripts there is one variable that specifies the amount of
+indent for a continuation line, a line that starts with a backslash: >
+
+	:let g:vim_indent_cont = &sw * 3
+
+Three times shiftwidth is the default value.
+
+
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 62044e5cdf..4245b63483 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.0aa.  Last change: 2004 Jul 23
+*message.txt*   For Vim version 7.0aa.  Last change: 2004 Aug 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -412,6 +412,12 @@ abandon the buffer forcefully, e.g., with ":qa!".  Careful, make sure you
 don't throw away changes you really want to keep.  You might have forgotten
 about a buffer, especially when 'hidden' is set.
 
+>
+  [No write since last change]
+
+This appears when executing a shell command while at least one buffer was
+changed.  To avoid the message reset the 'warn' option.
+
 							*E38*  >
   Null argument
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f94b52a4ad..376bb6b43e 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 24
+*options.txt*	For Vim version 7.0aa.  Last change: 2004 Aug 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -188,7 +188,7 @@ the value "ab", using "set guioptions-=ba" won't work, because the string "ba"
 doesn't appear.
 
 			   *:set_env* *expand-env* *expand-environment-var*
-Environment variables in most string options will be expanded.  If the
+Environment variables in specific string options will be expanded.  If the
 environment variable exists the '$' and the following environment variable
 name is replaced with its value.  If it does not exist the '$' and the name
 are not modified.  Any non-id character (not a letter, digit or '_') may
@@ -2903,6 +2903,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		      BALTIC, CHINESEBIG5, DEFAULT, EASTEUROPE, GB2312, GREEK,
 		      HANGEUL, HEBREW, JOHAB, MAC, OEM, RUSSIAN, SHIFTJIS,
 		      SYMBOL, THAI, TURKISH, VIETNAMESE ANSI and BALTIC.
+		      Normally you would use "cDEFAULT".
 
 	  Use a ':' to separate the options.
 	- A '_' can be used in the place of a space, so you don't need to use
@@ -5730,7 +5731,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Tags in unsorted tags files, and matches with different case will only
 	be found in the retry.
 
-	If a tag file indicates that is is case-fold sorted, the second,
+	If a tag file indicates that it is case-fold sorted, the second,
 	linear search can be avoided for the 'ignorecase' case.  Use a value
 	of '2' in the "!_TAG_FILE_SORTED" line for this.  A tag file can be
 	case-fold sorted with the -f switch to "sort" in most unices, as in
diff --git a/runtime/doc/os_msdos.txt b/runtime/doc/os_msdos.txt
index 01290e9ffe..3c749f0eb9 100644
--- a/runtime/doc/os_msdos.txt
+++ b/runtime/doc/os_msdos.txt
@@ -1,4 +1,4 @@
-*os_msdos.txt*  For Vim version 7.0aa.  Last change: 2001 Sep 03
+*os_msdos.txt*  For Vim version 7.0aa.  Last change: 2004 Aug 31
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -207,18 +207,24 @@ in such a way that it becomes too long may give unexpected results.
 8. Symbolically linked files			*msdos-linked-files*
 
 When using Vim to edit a symbolically linked file on a unix NFS file server,
-you may run into problems.
-When writing the file, Vim does not "write through" the symlink.  Instead, it
-deletes the symbolic link and creates a new file in its place.
-   On Unix, Vim is prepared for links (symbolic or hard).  A backup copy of
-the original file is made and then the original file is overwritten.  This
-assures that all properties of the file remain the same.  On non-Unix systems,
-the original file is renamed and a new file is written.  Only the protection
-bits are set like the original file.  However, this doesn't work properly when
+you may run into problems.  When writing the file, Vim does not "write
+through" the symlink.  Instead, it deletes the symbolic link and creates a new
+file in its place.
+
+On Unix, Vim is prepared for links (symbolic or hard).  A backup copy of the
+original file is made and then the original file is overwritten.  This assures
+that all properties of the file remain the same.  On non-Unix systems, the
+original file is renamed and a new file is written.  Only the protection bits
+are set like the original file.  However, this doesn't work properly when
 working on an NFS-mounted file system where links and other things exist.  The
 only way to fix this in the current version is not making a backup file, by
 ":set nobackup nowritebackup"	|'writebackup'|
 
+A similar problem occurs when mounting a Unix filesystem through Samba or a
+similar system.  When Vim creates a new file it will get the default user ID
+for the mounted file system.  This may be different from the original user ID.
+To avoid this set the 'backupcopy' option to "yes".
+
 ==============================================================================
 9. Copy/paste in a dos box			*msdos-copy-paste*
 
diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt
index 29d7096bf4..6f9a541c2e 100644
--- a/runtime/doc/os_win32.txt
+++ b/runtime/doc/os_win32.txt
@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 7.0aa.  Last change: 2004 May 01
+*os_win32.txt*  For Vim version 7.0aa.  Last change: 2004 Aug 31
 
 
 		  VIM REFERENCE MANUAL    by George Reilly
@@ -184,8 +184,9 @@ A. There are no good reasons to run the 16-bit DOS version on NT.  The Win32
    runs on top of an 80x86 emulator.
 
 Q. How do I change the font?
-A. In the GUI version, you can use the 'guifont' option.
-   In the console version, you need to set the font of the console itself.
+A. In the GUI version, you can use the 'guifont' option.  Example: >
+	:set guifont=Lucida_Console:h15:cDEFAULT
+<  In the console version, you need to set the font of the console itself.
    You cannot do this from within Vim.
 
 Q. When I change the size of the console window with ':set lines=xx' or
@@ -249,6 +250,16 @@ A. On Unix, Vim is prepared for links (symbolic or hard).  A backup copy of
    things exist.  The only way to fix this in the current version is not
    making a backup file, by ":set nobackup nowritebackup"     |'writebackup'|
 
+Q. I'm using Vim to edit a file on a Unix file server through Samba.  When I
+   write the file, the owner of the file is changed.  Why?
+A. When writing a file Vim renames the original file, this is a backup (in
+   case writing the file fails halfway).  Then the file is written as a new
+   file.  Samba then gives it the default owner for the file system, which may
+   differ from the original owner.
+   To avoid this set the 'backupcopy' option to "yes".  Vim will then make a
+   copy of the file for the backup, and overwrite the original file.  The
+   owner isn't changed then.
+
 Q. How do I get to see the output of ":make" while it's running?
 A. Basically what you need is to put a tee program that will copy its input
    (the output from make) to both stdout and to the errorfile.  You can find a
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 005072f999..068d42bbcc 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1,4 +1,4 @@
-*pi_netrw.txt  For Vim version 6.2.  Last change: Jul 26, 2004
+*pi_netrw.txt  For Vim version 6.2.  Last change: Jul 30, 2004
 
 
 		VIM REFERENCE MANUAL    by Charles E. Campbell, Jr.
@@ -16,7 +16,7 @@
 4.  Transparent File Transfer...........................|netrw-transparent|
 5.  Ex Commands.........................................|netrw-ex|
 6.  Variables and Options...............................|netrw-var|
-7.  Remote Directory Browser............................|netrw-browse|
+7.  Directory Browser...................................|netrw-browse|
 8.  Debugging...........................................|netrw-debug|
 9.  History.............................................|netrw-history|
 10. Credits.............................................|netrw-credits|
@@ -62,31 +62,31 @@ in your <.vimrc> file: >
 	    scp:    g:netrw_scp_cmd  = "scp -q"
 	   sftp:   g:netrw_sftp_cmd  = "sftp"
 
-    READING
+    READING					*netrw-read* *netrw-nread*
 	:Nread ?					give help
-	:Nread "machine:file"				uses rcp
-	:Nread "machine file"				uses ftp   with <.netrc>
-	:Nread "machine id password file"		uses ftp
-	:Nread "dav://machine[:port]/file"		uses cadaver
-	:Nread "fetch://[user@]machine/file"		uses fetch
-	:Nread "ftp://[user@]machine[[:#]port]/file"	uses ftp   autodetects <.netrc>
-	:Nread "http://[user@]machine/file"		uses http  uses wget
-	:Nread "rcp://[user@]machine/file"		uses rcp
-	:Nread "rsync://[user@]machine[:port]/file"	uses rsync
-	:Nread "scp://[user@]machine[[:#]port]/file"	uses scp
-	:Nread "sftp://[user@]machine/file"		uses sftp
-
-    WRITING
+	:Nread "machine:path"				uses rcp
+	:Nread "machine path"				uses ftp   with <.netrc>
+	:Nread "machine id password path"		uses ftp
+	:Nread "dav://machine[:port]/path"		uses cadaver
+	:Nread "fetch://[user@]machine/path"		uses fetch
+	:Nread "ftp://[user@]machine[[:#]port]/path"	uses ftp   autodetects <.netrc>
+	:Nread "http://[user@]machine/path"		uses http  uses wget
+	:Nread "rcp://[user@]machine/path"		uses rcp
+	:Nread "rsync://[user@]machine[:port]/path"	uses rsync
+	:Nread "scp://[user@]machine[[:#]port]/path"	uses scp
+	:Nread "sftp://[user@]machine/path"		uses sftp
+
+    WRITING					*netrw-write* *netrw-nwrite*
 	:Nwrite ?    					give help
-	:Nwrite "machine:file"				uses rcp
-	:Nwrite "machine file"				uses ftp   with <.netrc>
-	:Nwrite "machine id password file"		uses ftp
-	:Nwrite "dav://machine[:port]/file"		uses cadaver
-	:Nwrite "ftp://[user@]machine[[:#]port]/file"	uses ftp   autodetects <.netrc>
-	:Nwrite "rcp://[user@]machine/file"		uses rcp
-	:Nwrite "rsync://[user@]machine[:port]/file"	uses rsync
-	:Nwrite "scp://[user@]machine[[:#]port]/file"	uses scp
-	:Nwrite "sftp://[user@]machine/file"		uses sftp
+	:Nwrite "machine:path"				uses rcp
+	:Nwrite "machine path"				uses ftp   with <.netrc>
+	:Nwrite "machine id password path"		uses ftp
+	:Nwrite "dav://machine[:port]/path"		uses cadaver
+	:Nwrite "ftp://[user@]machine[[:#]port]/path"	uses ftp   autodetects <.netrc>
+	:Nwrite "rcp://[user@]machine/path"		uses rcp
+	:Nwrite "rsync://[user@]machine[:port]/path"	uses rsync
+	:Nwrite "scp://[user@]machine[[:#]port]/path"	uses scp
+	:Nwrite "sftp://[user@]machine/path"		uses sftp
 	http: not supported!
 
     DIRECTORY LISTING
@@ -103,7 +103,7 @@ in your <.vimrc> file: >
 	:call NetUserPass("uid")		-- prompts for password
 	:call NetUserPass("uid","password")	-- sets global uid and password
 
-    VARIABLES
+    VARIABLES						*netrw-variables*
 	b:netrw_lastfile last file Network-read/written retained on
 			  a per-buffer basis		(supports plain :Nw )
 	s:netrw_line	  during Nw/NetWrite, holds current line   number
@@ -126,6 +126,21 @@ in your <.vimrc> file: >
 	g:netrw_use_nt_rcp=0 don't use the rcp of WinNT, Win2000 and WinXP (default)
 			  =1 use the rcp of WinNT,... in binary mode
 
+    PATHS							*netrw-path*
+
+	Paths to files are generally user-directory relative for most protocols.
+	It is possible that some protocol will make paths relative to some
+	associated directory, however.
+
+		example:  vim scp://user@host/somefile
+		example:  vim scp://user@host/subdir1/subdir2/somefile
+	
+	where "somefile" is the "user"'s home directory.  If you wish to get a
+	file using root-relative paths, use the full path:
+
+		example:  vim scp://user@host//somefile
+		example:  vim scp://user@host//subdir1/subdir2/somefile
+
 
 ==============================================================================
 2. Network-Oriented File Transfer				*netrw-xfer*
@@ -499,21 +514,26 @@ from <netrw.vim> itself:
 >
 
 ==============================================================================
-7. Remote Directory Browser *netrw-browse* *netrw-dir* *netrw-list* *netrw-help*
+7. Directory Browser	*netrw-browse* *netrw-dir* *netrw-list* *netrw-help*
      ?..........Help....................................|netrw-help|
      <cr>.......Browsing................................|netrw-cr|
-     <c-l>......Refreshing the Listing..................|netrw-c-l|
      <del>......Deleting Files or Directories...........|netrw-delete|
      -..........Going Up................................|netrw--|
      a..........Hiding Files or Directories.............|netrw-a|
+     b..........Bookmarking a Directory.................|netrw-b|
+     B..........Changing to a Bookmarked Directory......|netrw-B|
+     c..........Make Browsing Directory The Current Dir.|netrw-c|
+     d..........Make A New Directory....................|netrw-d|
      D..........Deleting Files or Directories...........|netrw-D|
-     \h.........Edit File/Directory Hiding List.........|netrw-h|
+     <c-h>......Edit File/Directory Hiding List.........|netrw-h|
      i..........Long Listing............................|netrw-i|
-     \m.........Make A New Directory....................|netrw-m|
+     <c-l>......Refreshing the Listing..................|netrw-ctrl-l|
      o..........Browsing with a Horizontal Split........|netrw-o|
+     q..........Listing Bookmarks.......................|netrw-q|
      r..........Reversing Sorting Order.................|netrw-r|
      R..........Renaming Files or Directories...........|netrw-R|
      s..........Selecting Sorting Style.................|netrw-s|
+     S..........Editing the Sorting Sequence............|netrw-S|
      v..........Browsing with a Vertical Split..........|netrw-v|
      x..........Customizing Browsing....................|netrw-x|
 
@@ -525,14 +545,15 @@ QUICK REFERENCE COMMANDS TABLE     			*netrw-browse-cmds*
 	   ?	Causes Netrw to issue help
 	 <cr>	Netrw will enter the directory or read the file
 	 <del>	Netrw will attempt to remove the file/directory
-	 <c-l>	Causes Netrw to refresh the directory listing
+	   d	Make a directory
 	   D	Netrw will attempt to remove the file(s)/directory(ies)
 	   R	Netrw will attempt to rename the file(s)/directory(ies)
 	   -	Makes Netrw go up one directory
 	   a	Show all of a directory (temporarily ignore g:netrw_list_hide)
-	  \h	Edit file hiding list
+	   c	Make current browsing directory the current directory
+	 <c-h>	Edit file hiding list
 	   i	Toggles between long and short listing
-	  \m	Make a directory
+	 <c-l>	Causes Netrw to refresh the directory listing
 	   o	Enter the file/directory under the cursor in a new browser
 	   	window.  A horizonta