diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt
index 903a574..965b18d 100644
--- a/runtime/doc/os_unix.txt
+++ b/runtime/doc/os_unix.txt
@@ -1,4 +1,4 @@
-*os_unix.txt*   For Vim version 7.0aa.  Last change: 2003 Mar 15
+*os_unix.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -54,7 +54,7 @@
 
 For real color terminals the ":highlight" command can be used.
 
-The file "tools/Vim132" is a shell script that can be used to put Vim in 132
+The file "tools/vim132" is a shell script that can be used to put Vim in 132
 column mode on a vt100 and lookalikes.
 
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index f9a56af..d40d7e7 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 7.0aa.  Last change: 2005 Feb 24
+*quickfix.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -32,7 +32,7 @@
 
 In Vim the quickfix commands are used more generally to find a list of
 positions in files.  For example, |:vimgrep| finds pattern matches.  You can
-use the positions in a script with the |errorlist()| function.  Thus you can
+use the positions in a script with the |getqflist()| function.  Thus you can
 do a lot more than the edit/compile/fix cycle!
 
 If you are using Manx's Aztec C compiler on the Amiga look here for how to use
@@ -609,6 +609,7 @@
 			uses the length for the column number)
 	%*{conv}	any scanf non-assignable conversion
 	%%		the single '%' character
+	%s		search text (finds a string)
 
 The "%f" conversion depends on the current 'isfname' setting.
 
@@ -631,6 +632,13 @@
 to indicate the column of the error.  This is to be used in a multi-line error
 message.  See |errorformat-javac| for a  useful example.
 
+The "%s" conversion specifies the text to search for to locate the error line.
+The text is used as a literal string.  The anchors "^" and "$" are added to
+the text to locate the error line exactly matching the search text and the
+text is prefixed with the "\V" atom to make it "very nomagic".  The "%s"
+conversion can be used to locate lines without a line number in the error
+output.  Like the output of the "grep" shell command.
+When the pattern is present the line number will not be used.
 
 Changing directory
 
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 269eb43..3464c83 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Mar 22
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Mar 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,11 +30,9 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Problem with hang in setmouse() -> update_mouseshape() (Froloff)
-    - check for termcap_active in option.c
-    - add gui.starting in misc2.c
+Check that xterm function keys XHOME and ZHOME do work.
 
-":e" causes a scroll (in spell.c).
+Wildcard expansion failure: ":w /tmp/$$.`echo test`" (Adri Verhoef)
 
 Mac unicode patch (Da Woon Jung):
 - selecting proportional font breaks display
@@ -51,22 +49,24 @@
     helpfile doc/myscript.txt
   For the "helpfile" item ":helptags" is run.
 
+Win32: Balloon text can't contain line break.
+
 Awaiting response:
 -   Patch for mch_FullName() also in Vim 6.3?  os_mswin.c
 -   Win32: tearoff menu window should have a scrollbar when it's taller than
     the screen.
 
-When on a line with a single character, "A CTRL-O <Home>" puts cursor back
-after end-of-line. (Peter Winters)  Make "o_eol" global and reset it when
-moving cursor?
-
 
 PLANNED FOR VERSION 7.0:
 
 -   Add SPELLCHECKER, with support for many languages.
     - Use "engspchk" from Charles Campbell for ideas.
+    - Alternative: use MySpell library (in OpenOffice.org).
+	http://spellchecker.mozdev.org/source.html
     - Alternative: use aspell library.
-    - Implement 's addition.
+    - Dump pre-parsed spell structs in a file?
+    - More complicated: Regions with different languages?  E.g. comments in
+      English, strings in German (po file).
     - Commands required:
 	add word to private dict: wrong and OK (in popup menu for evim)
 	    :spell good <word>	    zg
@@ -86,6 +86,7 @@
       Add ":syntax contains {pattern} add=@Spell" command?  A bit like ":syn
       cluster" but change the contains list directly for matching syntax
       items.
+    - Install spell files with src/main.aap.
     Alternatives using ispell or aspell:
     8   Add spell checking.  Use "ispell -a" somehow.
 	~/vim/patches/wm_vim-5_4d.zip  can be used as an example (includes
@@ -2624,8 +2625,13 @@
 Searching:
 7   Add "g/" and "gb" to search for a pattern in the Visually selected text?
     "g?" is already used for rot13.
-8   Add a mechanism for recursiveness: "\(([^()]*\@@[^()]*)\)\@r".  \@@ stands
-    for "go recursive here" and \@r marks the recursive atom.
+8   Add a mechanism for recursiveness: "\@(([^()]*\@g[^()]*)\)".  \@g stands
+    for "go recursive here" and \@( \) marks the recursive part.
+    Perl does it this way:
+	    $paren = qr/ \(( [^()] | (??{ $paren }) )* \) /x;
+    Here $paren is evaluated when it's encountered.  This is like a regexp
+    inside a regexp.  In the above terms it would be:
+	    \@((\([^()]\|\@g\)*)\)
 8   Add an item for a big character range, so that one can search for a
     chinese character: \z[234-1234]  or \z[XX-YY] or \z[0x23-0x234].
 7   Add an item stack to allow matching ().  One side is "push X on
@@ -3394,6 +3400,8 @@
     '}' as the start of a section (e.g. one shiftwidth to the right).
 7   Allow using Vim in a pipe: "ls | vim -u xxx.vim - | yyy".  Only needs
     implementing ":w" to stdout in the buffer that was read from stdin.
+    Perhaps writing to stdout will work, since stderr is used for the terminal
+    I/O.
 8   Allow opening an unnamed buffer with ":e !cmd" and ":sp !cmd".  Vile can
     do it.
 -   Add commands like ]] and [[ that do not include the line jumped to.
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 50e7657..9657ca5 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 20
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -197,7 +197,7 @@
 |:vimgrep|.
 
 If you want to use the search results in a script you can use the
-|errorlist()| function.
+|getqflist()| function.
 
 
 POSIX compatibility					*new-posix*
@@ -323,7 +323,7 @@
 |count()|		count nr of times a value is in a List or Dictionary
 |deepcopy()|		make a full copy of a List or Dictionary
 |empty()|		check if List or Dictionary is empty
-|errorlist()|		list of quickfix errors
+|getqflist()|		list of quickfix errors
 |extend()|		append one List to another or add items from one
 			Dictionary to another
 |filter()|		remove selected items from a List or Dictionary
@@ -351,6 +351,7 @@
 |remove()|		remove one or more items from a List or Dictionary
 |repeat()| 		Repeat "expr" "count" times.  (Christophe Poucet)
 |reverse()|		reverse the order of a List
+|setqflist()|		create a quickfix list
 |sort()|		sort a List
 |split()|		split a String into a List
 |string()|		String representation of a List or Dictionary
@@ -1013,4 +1014,7 @@
 When 'encoding' is "sjis" inserting CTRL-V u d800 a few times causes a crash.
 Don't insert a DBCS character with a NUL second byte.
 
+In Insert mode CTRL-O <Home> didn't move the cursor.  Made "ins_at_eol" global
+and reset it in nv_home().
+
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/vimdiff.1 b/runtime/doc/vimdiff.1
index e487284..079aeed 100644
--- a/runtime/doc/vimdiff.1
+++ b/runtime/doc/vimdiff.1
@@ -32,8 +32,8 @@
 changes in a fold.  'foldcolumn' is set to two to make it easy to spot the
 folds and open or close them.
 .SH OPTIONS
-Vertical splits are used to align the lines, as if the "-O" argument was used.
-To use horizontal splits intead, use the "-o" argument.
+Vertical splits are used to align the lines, as if the "\-O" argument was used.
+To use horizontal splits intead, use the "\-o" argument.
 .PP
 For all other arguments see vim(1).
 .SH SEE ALSO
diff --git a/runtime/plugin/gzip.vim b/runtime/plugin/gzip.vim
index 2b9b523..0e9d0f5 100644
--- a/runtime/plugin/gzip.vim
+++ b/runtime/plugin/gzip.vim
@@ -1,6 +1,6 @@
 " Vim plugin for editing compressed files.
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2004 Jul 30
+" Last Change: 2005 Mar 24
 
 " Exit quickly when:
 " - this plugin was already loaded
@@ -118,7 +118,7 @@
   " don't do anything if the cmd is not supported
   if s:check(a:cmd)
     " Rename the file before compressing it.
-    let nm = expand("<afile>")
+    let nm = resolve(expand("<afile>"))
     let nmt = s:tempname(nm)
     if rename(nm, nmt) == 0
       call system(a:cmd . " " . nmt)