updated for version 7.0015v7.0015

3 files changed, 44 insertions, 34 deletions

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 376bb6b43..17201b457 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 Aug 30
+*options.txt*	For Vim version 7.0aa.  Last change: 2004 Sep 04
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -473,6 +473,11 @@ options from a modeline, this is unusual.  If you have two windows open and
 the files in it set the same global option to a different value, the result
 depends on which one was opened last.
 
+When editing a file that was already loaded, only the window-local options
+from the modeline are used.  Thus if you manually changed a buffer-local
+option after opening the file, it won't be changed if you edit the same buffer
+in another window.  But window-local options will be set.
+
 							*modeline-version*
 If the modeline is only to be used for some versions of Vim, the version
 number can be specified where "vim:" is used:
@@ -6352,6 +6357,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 		buffer list is restored from the viminfo file.  Buffers
 		without a file name and buffers for help files are not written
 		to the viminfo file.
+		When followed by a number, the number specifies the maximum
+		number of buffers that are stored.  Without a number all
+		buffers are stored.
 	'	Maximum number of previously edited files for which the marks
 		are remembered.  This parameter must always be included when
 		'viminfo' is non-empty.
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index b72c62c7a..44ff811d9 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 Aug 31
+*todo.txt*      For Vim version 7.0aa.  Last change: 2004 Sep 06
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,37 +30,15 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Multi-byte char in file name causes trouble for opening, "send to" menu and
-writing.  Patches from Taro Muraoka:
-    ~/Mail/oldmail/muraoka/in.00575
-    ~/Mail/oldmail/muraoka/in.00577
-
-Is there a limit on the buffer list in the viminfo file?
-":n ~/.trashcan/bogus*" fills it.
-
-When gvim is started from the context menu the xxd menu entries don't work
-(Valencia).  xxd.exe is not in $VIMRUNTIME.
-
 Aborting at the ATTENTION prompt causes trouble:
     buffer remains active, nwindows isn't closed (fixed in buffer.c)
     alternate buffer gets "read error" flag.
     ":sbuf" and ":ball" leave an empty window behind.
 Change in handle_swap_exists() also in 6.3?
 
-Add remap-abbreviation solution to Vim 6.3?  It's about adding REMAP_SKIP and
-RM_ABBR in getchar.c.
-
-Added ga_append() here: (also to 6.3?)
-    script_get(eap, cmd)
-    gui_do_findrepl(flags, find_text, repl_text, down)
-    serverGetVimNames(dpy)  if_xcmdsrv.c, os_mswin.c
-
 Win32: When the path to a file has Russian characters, ":cd %:p:h" doesn't
 work. (Valery Kondakoff)
-
-Win32: When an argument is typed in a console in the active codepage, and
-'encoding' is "utf-8", detect this from illegal characters.  Convert from
-console or active codepage to utf-8 then.
+Solved in os_mswin.c.  Add to 6.3?
 
 For version 7.0:
 -   Include many PATCHES:
@@ -114,10 +92,10 @@ For version 7.0:
 	He will update the patch for 6.3.
     Autocommands:
     7   Completion of network shares, patch by Yasuhiro Matsumoto.
-	Update 2004 Jun 17.
+	Update 2004 Sep 6.
 	How does this work?  Missing comments.
     gettext()		Translate a message.  (Patch from Yasuhiro Matsumoto)
-			Update 2004 Jun 17
+			Update 2004 Sep 5
 			Missing docs.  Search in 'runtimepath'?
 			How to get the messages into the .po files?
     --- did not respond (yet) --
@@ -219,6 +197,7 @@ For version 7.0:
 -   "INTELLISENSE".  First cleanup the Insert-mode completion.
 	http://www.vim.org/scripts/script.php?script_id=747
 	http://sourceforge.net/projects/insenvim
+	http://cedet.sourceforge.net/intellisense.shtml (for Emacs)
 -   PERSISTENT UNDO: store undo in a file.
     Support multiple threads.  Show the list of changes in a window to be able
     to select a version.
@@ -283,10 +262,13 @@ Support ":set syntax=cpp.doxygen"?  Suggested patch by Michael Geddes (9 Aug
 2004).  Should also work for 'filetype'.
 
 Patch for 'breakindent' option: repeat indent for wrapped line. (Vaclav
-Smilauer, 2004 Aug 17)
+Smilauer, 2004 Sep 5)
 
 
 Vi incompatibility:
+9   In Ex mode, "u" undoes all changes, not just the last one. (John Cowan)
+8   In Ex mode, an empty file doesn't have a first line, "1p" should fail.
+8   In Ex mode, "1,3" should print three lines.
 8   With undo/redo only marks in the changed lines should be changed.  Other
     marks should be kept.  Vi keeps each mark at the same text, even when it
     is deleted or restored. (Webb)
@@ -2996,7 +2978,9 @@ Debug mode:
 8   Add breakpoints for setting an option
 8   Add breakpoints for assigning to a variable.
 7   Add a watchpoint in the debug mode: An expression that breaks execution
-    when evaluating to non-zero.
+    when evaluating to non-zero.  Add the "watchadd expr" command, stop when
+    the value of the expression changes.  ":watchdel" deletes an item,
+    ":watchlist" lists the items. (Charles Campbell)
 7   Store the history from debug mode in viminfo.
 7   Make the debug mode history available with histget() et al.
 
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 4260877c5..42f6628e5 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 Sep 01
+*version7.txt*  For Vim version 7.0aa.  Last change: 2004 Sep 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -154,6 +154,13 @@ ABAB/4 syntax file. (Marius van Wyk)
 
 SQL-Informix syntax file. (Dean L Hill)
 
+PHP compiler plugin. (Doug Kearns)
+
+
+New message translations: ~
+
+The Ukranian messages are now also available in cp1251.
+
 
 Others: ~
 
@@ -215,6 +222,9 @@ VMS: In the usage message mention that a slash can be used to make a flag
 upper case.  Add color support to the builtin vt320 terminal codes.
 (Zoltan Arpadffy)
 
+For the '%' item in 'viminfo', allow a number to set a maximum for the number
+of buffers.
+
 ==============================================================================
 COMPILE TIME CHANGES					*compile-changes-7*
 
@@ -263,10 +273,6 @@ When indent was added automatically and then moving the cursor, the indent was
 not deleted (like when pressing ESC).  The "I" flag in 'cpoptions' can be used
 to make it work the old way.
 
-When <Space> is mapped to something that starts with a space, typing <Space>
-does not expand abbreviations.  Only disable expanding abbreviations when a
-mapping is not remapped, not when the RHS starts with the LHS.
-
 When opening a command-line window, 'textwidth' gets set to 78 by the Vim
 filetype plugin.  Reset 'textwidth' to 0 to avoid lines are broken.
 
@@ -330,4 +336,16 @@ detected.  Reset did_filetype in enter_buffer().
 When using ":argdo" and the window already was at the first argument index,
 but not actually editing it, the current buffer would be used instead.
 
+When ":next dir/*" includes many matches, adding the names to the argument
+list may take an awful lot of time and can't be interrupted.  Allow
+interrupting this.
+
+When editing a file that was already loaded in a buffer, modelines were not
+used.  Now window-local options in the modeline are set.  Buffer-local options
+and global options remain unmodified.
+
+Win32: When 'encoding' is set to "utf-8" in the vimrc file, files from the
+command line with non-ASCII characters are not used correctly.  Recode the
+file names when 'encoding' is set, using the Unicode command line.
+
  vim:tw=78:ts=8:ft=help:norl: