diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 5430be0..974b7a5 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 7.0aa.  Last change: 2006 Jan 30
+*quickfix.txt*  For Vim version 7.0aa.  Last change: 2006 Feb 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -189,6 +189,17 @@
 :lb[uffer] [bufnr]	Same as ":cbuffer", except the location list for the
 			current window is used instead of the quickfix list.
 
+							*:caddb* *:caddbuffer*
+:caddb[uffer] [bufnr]	Read the error list from the current buffer and add
+			the errors to the current quickfix list.  If a
+			quickfix list is not present, then a new list is
+			created. Otherwise, same as ":cbuffer".
+
+							*:laddb* *:laddbuffer*
+:laddb[uffer] [bufnr]	Same as ":caddbuffer", except the location list for
+			the current window is used instead of the quickfix
+			list.
+
 							*:cex* *:cexpr* *E777*
 :cex[pr][!] {expr}	Create a quickfix list using the result of {expr} and
 			jump to the first error.  If {expr} is a String, then
@@ -412,6 +423,11 @@
 			This command does not accept a comment, any "
 			characters are considered part of the arguments.
 
+							*:lmak* *:lmake*
+:lmak[e][!] [arguments]
+			Same as ":make", except the location list for the
+			current window is used instead of the quickfix list.
+
 The ":make" command executes the command given with the 'makeprg' option.
 This is done by passing the command to the shell given with the 'shell'
 option.  This works almost like typing
@@ -503,6 +519,12 @@
 			Example: >
 				:vimgrep Error *.c
 <
+							*:lv* *:lvimgrep*
+:lv[imgrep][!] /{pattern}/[g][j] {file} ...
+:lv[imgrep][!] {pattern} {file} ...
+			Same as ":vimgrep", except the location list for the
+			current window is used instead of the quickfix list.
+
 						*:vimgrepa* *:vimgrepadd*
 :vimgrepa[dd][!] /{pattern}/[g][j] {file} ...
 :vimgrepa[dd][!] {pattern} {file} ...
@@ -510,6 +532,12 @@
 			of errors the matches are appended to the current
 			list.
 
+						*:lvimgrepa* *:lvimgrepadd*
+:lvimgrepa[dd][!] /{pattern}/[g][j] {file} ...
+:lvimgrepa[dd][!] {pattern} {file} ...
+			Same as ":vimgrepadd", except the location list for
+			the current window is used instead of the quickfix
+			list.
 
 5.2 External grep
 
@@ -525,6 +553,11 @@
 			When 'grepprg' is "internal" this works like
 			|:vimgrep|.  Note that the pattern needs to be
 			enclosed in separator characters then.
+
+							    *:lgr* *:lgrep*
+:lgr[ep][!] [arguments]	Same as ":grep", except the location list for the
+			current window is used instead of the quickfix list.
+
 							*:grepa* *:grepadd*
 :grepa[dd][!] [arguments]
 			Just like ":grep", but instead of making a new list of
@@ -538,6 +571,11 @@
 			":grepadd" jumps to the first error, which is not
 			allowed with |:bufdo|.
 
+							*:lgrepa* *:lgrepadd*
+:lgrepa[dd][!] [arguments]
+			Same as ":grepadd", except the location list for the
+			current window is used instead of the quickfix list.
+
 5.3 Setting up external grep
 
 If you have a standard "grep" program installed, the :grep command may work
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 41f5756..ab46f83 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2006 Feb 03
+*todo.txt*      For Vim version 7.0aa.  Last change: 2006 Feb 04
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -32,9 +32,6 @@
 
 Variant of ":helpgrep" that uses a location list?  How about:
     :lhelpgrep  (use local list in help window, not current window)
-    :lgrep
-    :lvimgrep
-    :lmake
 
 ccomplete / omnicomplete:
 - Extra info for each entry to show in a tooltip kind of thing.
@@ -46,11 +43,6 @@
 		    v = variable, f = function/method, c = composite (object,
 		    struct pointer).
   For C add tag "kind" field?
-- When an option is set: In completion mode and the user types (identifier)
-  characters, advance to the first match instead of removing the popup menu.
-  If there is no match remove the selection. (Yegappan Lakshmanan)
-  Keep the current list of all matches.  Use the text typed (or completed) so
-  far to make a second list with only matching entries.
 - Complete the longest common match instead of the first match?
     Do this when "longest" is in 'completeopt'.
     Pressing CTRL-N or CTRL-P will get the whole match, as before.
@@ -289,6 +281,8 @@
     Need to be able to search the windows in inactive tabs, e.g. for the
     quickfix window.
     Use "1gt" - "99gt" to switch to a tab?
+    Also hidden tabs? Useful for messing with a temp buffer without changing
+    the window layout.
 -   EMBEDDING: Make it possible to run Vim inside a window of another program.
     For Xwindows this can be done with XReparentWindow().
     For GTK Neil Bird has a patch to use Vim like a widget.
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 7c9d325..d0d1e85 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2006 Feb 02
+*version7.txt*  For Vim version 7.0aa.  Last change: 2006 Feb 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -357,6 +357,7 @@
 
 See |:map-operator| for the explanation and an example.
 
+
 Location list						*new-location-list*
 -------------
 
@@ -364,6 +365,8 @@
 location list can be displayed in a location window (similar to the quickfix
 window). You can open more than one location list window. A set of commands
 similar to the quickfix commands are added to browse the location list.
+(Yegappan Lakshmanan)
+
 
 Various new items					*new-items-7*
 -----------------
@@ -448,8 +451,16 @@
 
 |:caddexpr|		Add error messages from a Vim expression to an
 			existing quickfix list. (Yegappan Lakshmanan).
+|:caddbuffer|		Add errors from the current buffer to the quickfix
+			list.
 
 |:ltag|			Jump to a tag and add matching tags to a location list.
+|:lmake|		Like |:make| but use the location list.
+|:lgrep|		Like |:grep| but use the location list.
+|:lgrepadd|		Like |:grepadd| but use the location list.
+|:lvimgrep|		Like |:vimgrep| but use the location list.
+|:lvimgrepadd|		Like |:vimgrepadd| but use the location list.
+|:laddbuffer|		Like |:caddbuffer| but use the location list.
 
 
 Ex command modifiers: ~
diff --git a/runtime/lang/menu_ja_jp.utf-8.vim b/runtime/lang/menu_ja_jp.utf-8.vim
index 7b7f8bf..2aafe80 100644
--- a/runtime/lang/menu_ja_jp.utf-8.vim
+++ b/runtime/lang/menu_ja_jp.utf-8.vim
@@ -2,7 +2,7 @@
 "
 " Menu Translations:	Japanese (UTF-8)
 " Translated By:	MURAOKA Taro  <koron@tka.att.ne.jp>
-" Last Change:		29-Apr-2004.
+" Last Change:		04-Feb-2006.
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -142,7 +142,23 @@
 menutrans &Close<Tab>:cclose		閉じる(&C)<Tab>:cclose
 menutrans &Convert\ to\ HEX<Tab>:%!xxd	HEXへ変換(&C)<Tab>:%!xxd
 menutrans Conve&rt\ back<Tab>:%!xxd\ -r	HEXから逆変換(&R)<Tab>%!xxd\ -r
-menutrans &Set\ Compiler		コンパイラ設定(&S)
+menutrans Se&T\ Compiler		コンパイラ設定(&T)
+
+" Tools.Spelling Menu
+menutrans &Spelling			スペリング(&S)
+menutrans &Spell\ Check\ On		スペルチェック有効(&S)
+menutrans Spell\ Check\ &Off		スペルチェック有効(&O)
+menutrans To\ &Next\ error<Tab>]s	次のエラー(&N)<Tab>]s
+menutrans To\ &Previous\ error<Tab>[s	前のエラー(&P)<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z?	修正候補(&C)<Tab>z?
+menutrans &Repeat\ correction<Tab>:spellrepall	修正を繰り返す(&R)<Tab>:spellrepall
+menutrans Set\ language\ to\ "en"	言語を\ "en"\ に設定する
+menutrans Set\ language\ to\ "en_au"	言語を\ "en_au"\ に設定する
+menutrans Set\ language\ to\ "en_ca"	言語を\ "en_ca"\ に設定する
+menutrans Set\ language\ to\ "en_gb"	言語を\ "en_gb"\ に設定する
+menutrans Set\ language\ to\ "en_nz"	言語を\ "en_nz"\ に設定する
+menutrans Set\ language\ to\ "en_us"	言語を\ "en_us"\ に設定する
+menutrans &Find\ More\ Languages	他の言語を検索する(&F)
 
 " Tools.Fold Menu
 menutrans &Folding			折畳み(&F)
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 7a9c033..488c6de 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -187,6 +187,8 @@
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
 EX(CMD_cabclear,	"cabclear",	ex_abclear,
 			EXTRA|TRLBAR|CMDWIN),
+EX(CMD_caddbuffer,	"caddbuffer",	ex_cbuffer,
+			RANGE|NOTADR|WORD1|TRLBAR),
 EX(CMD_caddexpr,	"caddexpr",	ex_cexpr,
 			NEEDARG|WORD1|NOTRLCOM|TRLBAR|BANG),
 EX(CMD_caddfile,	"caddfile",	ex_cfile,
@@ -483,6 +485,8 @@
 			EXTRA|TRLBAR|CMDWIN),
 EX(CMD_laddexpr,	"laddexpr",	ex_cexpr,
 			NEEDARG|WORD1|NOTRLCOM|TRLBAR|BANG),
+EX(CMD_laddbuffer,	"laddbuffer",	ex_cbuffer,
+			RANGE|NOTADR|WORD1|TRLBAR),
 EX(CMD_laddfile,	"laddfile",	ex_cfile,
 			TRLBAR|FILE1),
 EX(CMD_lbuffer,		"lbuffer",	ex_cbuffer,
@@ -507,6 +511,10 @@
 			RANGE|NOTADR|COUNT|TRLBAR|BANG),
 EX(CMD_lgetfile,	"lgetfile",	ex_cfile,
 			TRLBAR|FILE1|BANG),
+EX(CMD_lgrep,		"lgrep",	ex_make,
+			BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE),
+EX(CMD_lgrepadd,	"lgrepadd",	ex_make,
+			BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE),
 EX(CMD_ll,		"ll",		ex_cc,
 			RANGE|NOTADR|COUNT|TRLBAR|BANG),
 EX(CMD_llast,		"llast",	ex_cc,
@@ -517,6 +525,8 @@
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
 EX(CMD_lmapclear,	"lmapclear",	ex_mapclear,
 			EXTRA|TRLBAR|CMDWIN),
+EX(CMD_lmake,		"lmake",	ex_make,
+			BANG|EXTRA|NOTRLCOM|TRLBAR|XFILE),
 EX(CMD_lnoremap,	"lnoremap",	ex_map,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
 EX(CMD_lnext,		"lnext",	ex_cnext,
@@ -547,6 +557,10 @@
 			NOTADR|TRLBAR|BANG|WORD1),
 EX(CMD_lunmap,		"lunmap",	ex_unmap,
 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+EX(CMD_lvimgrep,	"lvimgrep",	ex_vimgrep,
+			BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE),
+EX(CMD_lvimgrepadd,	"lvimgrepadd",	ex_vimgrep,
+			BANG|NEEDARG|EXTRA|NOTRLCOM|TRLBAR|XFILE),
 EX(CMD_lwindow,		"lwindow",	ex_cwindow,
 			RANGE|NOTADR|COUNT|TRLBAR),
 EX(CMD_ls,		"ls",		buflist_list,
diff --git a/src/po/cleanup.vim b/src/po/cleanup.vim
index a4905c2..24ae74e 100644
--- a/src/po/cleanup.vim
+++ b/src/po/cleanup.vim
@@ -3,9 +3,17 @@
 " - Comment-out fuzzy and empty messages.
 " - Make sure there is a space before the string (required for Solaris).
 " Requires Vim 6.0 or later (because of multi-line search patterns).
-diffoff!
+
+" Disable diff mode, because it makes this very slow
+let s:was_diff = &diff
+setl nodiff
+
 silent g/^#: /d
 silent g/^#, fuzzy\(, .*\)\=\nmsgid ""\@!/.+1,/^$/-1s/^/#\~ /
 silent g/^msgstr"/s//msgstr "/
 silent g/^msgid"/s//msgid "/
 silent g/^msgstr ""\(\n"\)\@!/?^msgid?,.s/^/#\~ /
+
+if s:was_diff
+  setl diff
+endif