diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 0148330..bb11f9c 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -980,7 +980,7 @@
 			If no register is specified, it depends on the 'cb'
 			option: If 'cb' contains "unnamedplus", paste from the
 			+ register |quoteplus|.  Otherwise, if 'cb' contains
-			"unnamed", paste from the * register |quote_star|.
+			"unnamed", paste from the * register |quotestar|.
 			Otherwise, paste from the unnamed register
 			|quote_quote|.
 			The register can also be '=' followed by an optional
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 2c79617..1080431 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.3.  Last change: 2012 Mar 28
+*options.txt*	For Vim version 7.3.  Last change: 2012 Apr 26
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -7119,8 +7119,6 @@
 	the file should contain words with similar meaning, separated by
 	non-keyword characters (white space is preferred).  Maximum line
 	length is 510 bytes.
-	To obtain a file to be used here, check out the wordlist FAQ at
-	http://www.hyphenologist.co.uk .
 	To include a comma in a file name precede it with a backslash.  Spaces
 	after a comma are ignored, otherwise spaces are included in the file
 	name.  See |option-backslash| about using backslashes.
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 119fdf5..8457aec 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -6569,6 +6569,7 @@
 lua-vim	if_lua.txt	/*lua-vim*
 lua-window	if_lua.txt	/*lua-window*
 lua.vim	syntax.txt	/*lua.vim*
+luaeval()	eval.txt	/*luaeval()*
 m	motion.txt	/*m*
 m'	motion.txt	/*m'*
 m[	motion.txt	/*m[*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 7ee7b36..cdd74fb 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.3.  Last change: 2012 Apr 25
+*todo.txt*      For Vim version 7.3.  Last change: 2012 Apr 26
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -43,6 +43,11 @@
 Stack trace of crash: http://vpaste.net/GBt9S
 (Alexandre Provencio)
 
+Patch for IBM z/OS makefile. (Stephen Bovy, 2012 Apr 26)
+
+Test 77 fails if cksum uses tabs instead of spaces. (Michael Soyka, 2012 Apr
+25)
+
 Once syntax and other runtime files have been fixed: add "set cp" to
 check.vim.  Use a function to run both with 'cp' and 'nocp'.
 
@@ -58,6 +63,7 @@
 
 Patch for crash involving curwin->w_s. (Christian Brabandt, 2012 Apr 20)
 What is the cause?  Leaks memory?  Other solution?
+More debug info Apr 26.
 
 Issue 54: document behavior of -complete, also expands arg.
 
diff --git a/runtime/ftplugin/dosbatch.vim b/runtime/ftplugin/dosbatch.vim
index 7662896..d83dc3b 100644
--- a/runtime/ftplugin/dosbatch.vim
+++ b/runtime/ftplugin/dosbatch.vim
@@ -20,5 +20,4 @@
   let b:browsefilter = "DOS Batch Files (*.bat, *.cmd)\t*.bat;*.cmd\nAll Files (*.*)\t*.*\n"
 endif
 
-let b:undo_ftplugin = "setlocal comments< formatoptions<"
-    \ . "| unlet! b:browsefiler"
+let b:undo_ftplugin = "setlocal comments< formatoptions< | unlet! b:browsefiler"
diff --git a/runtime/ftplugin/postscr.vim b/runtime/ftplugin/postscr.vim
index 505f08f..3bdd2e6 100644
--- a/runtime/ftplugin/postscr.vim
+++ b/runtime/ftplugin/postscr.vim
@@ -31,8 +31,8 @@
     \ "All Files (*.*)\t*.*\n"
 endif
 
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
 let b:undo_ftplugin = "setlocal comments< formatoptions<"
     \ . "| unlet! b:browsefiler b:match_ignorecase b:match_words"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save