diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 32cad6764b056252a652899c98eac326e9d5380d..2fae1e2fb668281958affbc786086ef397b3f81a 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -266,7 +266,7 @@ Name			triggered by ~
 |GUIFailed|		after starting the GUI failed
 |TermResponse|		after the terminal response to |t_RV| is received
 
-|QuitPre|			when using `:quit`, before deciding whether to quit
+|QuitPre|		when using `:quit`, before deciding whether to quit
 |VimLeavePre|		before exiting Vim, before writing the viminfo file
 |VimLeave|		before exiting Vim, after writing the viminfo file
 
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 9f1723a1a69a5c496a0cdfd47a3a0defb1354ca6..c23f2636741a5a8622a431329e134a2c366ad4a9 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.3.  Last change: 2012 Aug 08
+*editing.txt*   For Vim version 7.3.  Last change: 2013 Feb 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -424,7 +424,7 @@ external command, by using the syntax `={expr}` e.g.: >
 	:e `=tempname()`
 The expression can contain just about anything, thus this can also be used to
 avoid the special meaning of '"', '|', '%' and '#'.  However, 'wildignore'
-does apply like to other wildcars.
+does apply like to other wildcards.
 If the expression returns a string then names are to be separated with line
 breaks.  When the result is a |List| then each item is used as a name.  Line
 breaks also separate names.
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index c643ab8dbf79fdab04d480c1fa5123da45da5ad6..856726a99875b3bb5f17b8da4ab7619c29a6aff7 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -394,8 +394,8 @@ CTRL-{char}	{char} typed as a control character; that is, typing {char}
 							*quotecommandquote*
 "command"	A reference to a command that you can type is enclosed in
 		double quotes.
-`command`		New style command, this distinguishes it from other
-		quoted text and strings.
+`command`	New style command, this distinguishes it from other quoted
+		text and strings.
 
 					*key-notation* *key-codes* *keycodes*
 These names for keys are used in the documentation.  They can also be used
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 3beb2b0cff76b20da0b78686cbf2a394412460e2..6be278aac8032fe0e0c3cf21a029526636623df1 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.3.  Last change: 2013 Jan 30
+*options.txt*	For Vim version 7.3.  Last change: 2013 Feb 13
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1463,11 +1463,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 			|gui-clipboard|.
 
 						*clipboard-unnamedplus*
-	unnamedplus	A variant of "unnamed" flag which uses the clipboard
-			register '+' (|quoteplus|) instead of register '*' for
-			all operations except yank.  Yank shall copy the text
-			into register '+' and also into '*' when "unnamed" is
-			included.
+	unnamedplus	A variant of the "unnamed" flag which uses the
+			clipboard register '+' (|quoteplus|) instead of
+			register '*' for all yank, delete, change and put
+			operations which would normally go to the unnamed
+			register.  When "unnamed" is also included to the
+			option, yank operations (but not delete, change or
+			put) will additionally copy the text into register
+			'*'.
 			Only available with the |+X11| feature.
 			Availability can be checked with: >
 				if has('unnamedplus')
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 6040ba88f8ff6ad642949ddeec120a976b1cf82f..7565c898e24ea3b1e312476a01ce24a057065853 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -504,7 +504,7 @@ Character classes {not in Vi}:				*/character-classes*
 	x	x	a character with no special meaning matches itself
 
 |/[]|	[]	\[]	any character specified inside the []
-|/\%[]| \%[]	\%[]	a sequence of optionally matched atoms
+|/\%[]|	\%[]	\%[]	a sequence of optionally matched atoms
 
 |/\c|	\c	\c	ignore case, do not use the 'ignorecase' option
 |/\C|	\C	\C	match case, do not use the 'ignorecase' option
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 1fef2177d267e1a26a433408abb4f0ca2f772620..5f76f71e699367e5747d0414de2b4e88be04a4cc 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 7.3.  Last change: 2012 Feb 22
+*quickref.txt*  For Vim version 7.3.  Last change: 2013 Feb 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -7,7 +7,7 @@
 
 							 *quickref* *Contents*
  tag	  subject			 tag	  subject	~
-|Q_ct|  list of help files		|Q_re|	Repeating commands
+|Q_ct|	list of help files		|Q_re|	Repeating commands
 |Q_lr|	motion: Left-right		|Q_km|	Key mapping
 |Q_ud|	motion: Up-down			|Q_ab|	Abbreviations
 |Q_tm|	motion: Text object		|Q_op|	Options
@@ -27,7 +27,7 @@
 |Q_co|	change: Complex			|Q_bu|	Buffer list commands
 |Q_vi|	Visual mode			|Q_sy|	Syntax highlighting
 |Q_to|	Text objects			|Q_gu|	GUI commands
-					|Q_fo|  Folding
+					|Q_fo|	Folding
 
 ------------------------------------------------------------------------------
 N is used to indicate an optional count that can be given before the command.
@@ -186,7 +186,7 @@ N is used to indicate an optional count that can be given before the command.
 |:marks|  :marks	print the active marks
 |CTRL-O|  N  CTRL-O	go to Nth older position in jump list
 |CTRL-I|  N  CTRL-I	go to Nth newer position in jump list
-|:ju|	  :ju[mps]	print the jump list
+|:ju|     :ju[mps]	print the jump list
 ------------------------------------------------------------------------------
 *Q_vm*		Various motions
 
@@ -204,30 +204,30 @@ N is used to indicate an optional count that can be given before the command.
 ------------------------------------------------------------------------------
 *Q_ta*		Using tags
 
-|:ta|	   :ta[g][!] {tag}	jump to tag {tag}
-|:ta|	   :[count]ta[g][!]	jump to [count]'th newer tag in tag list
+|:ta|      :ta[g][!] {tag}	jump to tag {tag}
+|:ta|      :[count]ta[g][!]	jump to [count]'th newer tag in tag list
 |CTRL-]|      CTRL-]		jump to the tag under cursor, unless changes
 				   have been made
-|:ts|	   :ts[elect][!] [tag]	list matching tags and select one to jump to
+|:ts|      :ts[elect][!] [tag]	list matching tags and select one to jump to
 |:tjump|   :tj[ump][!] [tag]	jump to tag [tag] or select from list when
 				   there are multiple matches
-|:ltag|	   :lt[ag][!] [tag]	jump to tag [tag] and add matching tags to the
+|:ltag|    :lt[ag][!] [tag]	jump to tag [tag] and add matching tags to the
 				   location list
 
-|:tags|	   :tags		print tag list
+|:tags|    :tags		print tag list
 |CTRL-T|   N  CTRL-T		jump back from Nth older tag in tag list
-|:po|	   :[count]po[p][!]	jump back from [count]'th older tag in tag list
+|:po|      :[count]po[p][!]	jump back from [count]'th older tag in tag list
 |:tnext|   :[count]tn[ext][!]	jump to [count]'th next matching tag
 |:tp|      :[count]tp[revious][!] jump to [count]'th previous matching tag
-|:tr|	   :[count]tr[ewind][!] jump to [count]'th matching tag
-|:tl|	   :tl[ast][!]		jump to last matching tag
+|:tr|      :[count]tr[ewind][!]	jump to [count]'th matching tag
+|:tl|      :tl[ast][!]		jump to last matching tag
 
-|:ptag|	   :pt[ag] {tag}	open a preview window to show tag {tag}
-|CTRL-W_}|     CTRL-W }		like CTRL-] but show tag in preview window
+|:ptag|    :pt[ag] {tag}	open a preview window to show tag {tag}
+|CTRL-W_}|    CTRL-W }		like CTRL-] but show tag in preview window
 |:pts|     :pts[elect]		like ":tselect" but show tag in preview window
 |:ptjump|  :ptj[ump]		like ":tjump" but show tag in preview window
 |:pclose|  :pc[lose]		close tag preview window
-|CTRL-W_z|     CTRL-W z		close tag preview window
+|CTRL-W_z|    CTRL-W z		close tag preview window
 ------------------------------------------------------------------------------
 *Q_sc*		Scrolling
 
@@ -260,7 +260,7 @@ These only work when 'wrap' is off:
 |:startreplace| :startr[eplace][!]  start Replace mode, at EOL when [!] used
 
 in Visual block mode:
-|v_b_I|    I	insert the same text in front of all the selected lines
+|v_b_I|	   I	insert the same text in front of all the selected lines
 |v_b_A|	   A	append the same text after all the selected lines
 ------------------------------------------------------------------------------
 *Q_ai*		Insert mode keys
@@ -334,16 +334,16 @@ In Insert or Command-line mode:
 *Q_de*		Deleting text
 
 |x|	N  x		delete N characters under and after the cursor
-|<Del>| N  <Del>	delete N characters under and after the cursor
+|<Del>|	N  <Del>	delete N characters under and after the cursor
 |X|	N  X		delete N characters before the cursor
 |d|	N  d{motion}	delete the text that is moved over with {motion}
-|v_d|	{visual}d	delete the highlighted text
+|v_d|	   {visual}d	delete the highlighted text
 |dd|	N  dd		delete N lines
 |D|	N  D		delete to the end of the line (and N-1 more lines)
 |J|	N  J		join N-1 lines (delete <EOL>s)
-|v_J|	{visual}J	join the highlighted lines
+|v_J|	   {visual}J	join the highlighted lines
 |gJ|	N  gJ		like "J", but without inserting spaces
-|v_gJ|	{visual}gJ	like "{visual}J", but without inserting spaces
+|v_gJ|	   {visual}gJ	like "{visual}J", but without inserting spaces
 |:d|	:[range]d [x]	delete [range] lines [into register x]
 ------------------------------------------------------------------------------
 *Q_cm*		Copying and moving text
@@ -369,7 +369,7 @@ In Insert or Command-line mode:
 |R|	  N  R		enter Replace mode (repeat the entered text N times)
 |gR|	  N  gR		enter virtual Replace mode: Like Replace mode but
 			   without affecting layout
-|v_b_r|	  {visual}r{char}
+|v_b_r|	     {visual}r{char}
 			in Visual block mode: Replace each char of the
 			   selected text with {char}
 
@@ -447,13 +447,13 @@ In Insert or Command-line mode:
 
 |visual-index|	list of Visual mode commands.
 
-|v|	   v		start highlighting characters  }  move cursor and use
-|V|	   V		start highlighting linewise    }  operator to affect
+|v|        v		start highlighting characters  }  move cursor and use
+|V|        V		start highlighting linewise    }  operator to affect
 |CTRL-V|   CTRL-V	start highlighting blockwise   }  highlighted text
-|v_o|	   o		exchange cursor position with start of highlighting
-|gv|	   gv		start highlighting on previous visual area
-|v_v|	   v		highlight characters or stop highlighting
-|v_V|	   V		highlight linewise or stop highlighting
+|v_o|      o		exchange cursor position with start of highlighting
+|gv|       gv		start highlighting on previous visual area
+|v_v|      v		highlight characters or stop highlighting
+|v_V|      V		highlight linewise or stop highlighting
 |v_CTRL-V| CTRL-V	highlight blockwise or stop highlighting
 ------------------------------------------------------------------------------
 *Q_to*		Text objects (only in Visual mode or after an operator)
@@ -509,8 +509,8 @@ In Insert or Command-line mode:
 ------------------------------------------------------------------------------
 *Q_km*		Key mapping
 
-|:map|	     :ma[p] {lhs} {rhs}	  map {lhs} to {rhs} in Normal and Visual mode
-|:map!|	     :ma[p]! {lhs} {rhs}  map {lhs} to {rhs} in Insert and Command-line
+|:map|       :ma[p] {lhs} {rhs}	  map {lhs} to {rhs} in Normal and Visual mode
+|:map!|      :ma[p]! {lhs} {rhs}  map {lhs} to {rhs} in Insert and Command-line
 				     mode
 |:noremap|   :no[remap][!] {lhs} {rhs}
 				  same as ":map", no remapping for this {rhs}
@@ -522,19 +522,19 @@ In Insert or Command-line mode:
 				     Normal and Visual mode
 |:map_l!|    :ma[p]! [lhs]	  list mappings (starting with [lhs]) for
 				     Insert and Command-line mode
-|:cmap|	     :cmap/:cunmap/:cnoremap
+|:cmap|      :cmap/:cunmap/:cnoremap
 				  like ":map!"/":unmap!"/":noremap!" but for
 				     Command-line mode only
-|:imap|	     :imap/:iunmap/:inoremap
+|:imap|      :imap/:iunmap/:inoremap
 				  like ":map!"/":unmap!"/":noremap!" but for
 				     Insert mode only
-|:nmap|	     :nmap/:nunmap/:nnoremap
+|:nmap|      :nmap/:nunmap/:nnoremap
 				  like ":map"/":unmap"/":noremap" but for
 				     Normal mode only
-|:vmap|	     :vmap/:vunmap/:vnoremap
+|:vmap|      :vmap/:vunmap/:vnoremap
 				  like ":map"/":unmap"/":noremap" but for
 				     Visual mode only
-|:omap|	     :omap/:ounmap/:onoremap
+|:omap|      :omap/:ounmap/:onoremap
 				  like ":map"/":unmap"/":noremap" but only for
 				     when an operator is pending
 |:mapc|      :mapc[lear]	  remove mappings for Normal and Visual mode
@@ -958,9 +958,9 @@ Short explanation of each option:		*option-list*
 ------------------------------------------------------------------------------
 *Q_ur*		Undo/Redo commands
 
-|u|	  N  u		undo last N changes
+|u|       N  u		undo last N changes
 |CTRL-R|  N  CTRL-R	redo last N undone changes
-|U|	     U		restore last changed line
+|U|          U		restore last changed line
 ------------------------------------------------------------------------------
 *Q_et*		External commands
 
@@ -1011,7 +1011,7 @@ Short explanation of each option:		*option-list*
 				   C4350, etc.)
 |:normal|	:norm[al][!] {commands}
 				execute Normal mode commands
-|Q|		Q		switch to "Ex" mode
+|Q|		   Q		switch to "Ex" mode
 
 |:redir|	:redir >{file}		redirect messages to {file}
 |:silent|	:silent[!] {command}	execute {command} silently
@@ -1087,11 +1087,11 @@ Context-sensitive completion on the command-line:
 ------------------------------------------------------------------------------
 *Q_ex*		Special Ex characters
 
-|:bar|	    |		separates two commands (not for ":global" and ":!")
+|:bar|      |		separates two commands (not for ":global" and ":!")
 |:quote|    "		begins comment
 
-|:_%|	    %		current file name (only where a file name is expected)
-|:_#|	    #[num]	alternate file name [num] (only where a file name is
+|:_%|       %		current file name (only where a file name is expected)
+|:_#|       #[num]	alternate file name [num] (only where a file name is
 			   expected)
 	Note: The next seven are typed literally; these are not special keys!
 |:<abuf>|   <abuf>	buffer number, for use in an autocommand (only where a
@@ -1171,18 +1171,18 @@ Context-sensitive completion on the command-line:
 	   Without !: Fail if changes have been made to the current buffer.
 	      With !: Discard any changes to the current buffer.
 |:edit_f|  :e[dit][!] {file}	edit {file}
-|:edit|	   :e[dit][!]		reload the current file
-|:enew|	   :ene[w][!]		edit a new, unnamed buffer
+|:edit|    :e[dit][!]		reload the current file
+|:enew|    :ene[w][!]		edit a new, unnamed buffer
 |:find|    :fin[d][!] {file}	find {file} in 'path' and edit it
 
-|CTRL-^|   N   CTRL-^		edit alternate file N (equivalent to ":e #N")
-|gf|	       gf  or ]f	edit the file whose name is under the cursor
-|:pwd|	   :pwd			print the current directory name
-|:cd|	   :cd [path]		change the current directory to [path]
-|:cd-|	   :cd -		back to previous current directory
-|:file|	   :f[ile]		print the current file name and the cursor
+|CTRL-^|   N  CTRL-^		edit alternate file N (equivalent to ":e #N")
+|gf|          gf  or ]f		edit the file whose name is under the cursor
+|:pwd|     :pwd			print the current directory name
+|:cd|      :cd [path]		change the current directory to [path]
+|:cd-|     :cd -		back to previous current directory
+|:file|    :f[ile]		print the current file name and the cursor
 				   position
-|:file|	   :f[ile] {name}	set the current file name to {name}
+|:file|    :f[ile] {name}	set the current file name to {name}
 |:files|   :files		show alternate file names
 ------------------------------------------------------------------------------
 *Q_fl*		Using the argument list			|argument-list|
@@ -1198,12 +1198,12 @@ Context-sensitive completion on the command-line:
 
 	     in current window    in new window	~
 |:argument|  :argu[ment] N	  :sar[gument] N	edit file N
-|:next|	     :n[ext]		  :sn[ext]		edit next file
+|:next|      :n[ext]		  :sn[ext]		edit next file
 |:next_f|    :n[ext] {arglist}	  :sn[ext] {arglist}	define new arg list
 							   and edit first file
-|:Next|	     :N[ext]		  :sN[ext]		edit previous file
+|:Next|      :N[ext]		  :sN[ext]		edit previous file
 |:first|     :fir[st]		  :sfir[st]		edit first file
-|:last|	     :la[st]		  :sla[st]		edit last file
+|:last|      :la[st]		  :sla[st]		edit last file
 ------------------------------------------------------------------------------
 *Q_wq*		Writing and quitting
 
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 50c011178e0875df893b432d95afa0287ba24196..f0e086b6d4dc88ae2cbab218467e049b03335408 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.3.  Last change: 2013 Feb 06
+*todo.txt*      For Vim version 7.3.  Last change: 2013 Feb 13
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,11 +34,9 @@ not be repeated below, unless there is extra information.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Substitute with confirmation and then "q" does not replace anything.
-(John McGowan)
-
 Download counter for scripts no longer incremented?
-Looks like it.
+Because SourceForge does not have the IP address now, see ticket
+https://sourceforge.net/p/forge/site-support/2461/?page=1
 
 Several syntax file match "^\s*" which may get underlined if that's in the
 highlight group.  Add a "\zs" after it?
@@ -49,29 +47,13 @@ Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
 
 Checking runtime scripts: Thilo Six, 2012 Jun 6.
 
-Patch for doc indenting. (Ken Takata, Feb 4)
-
 GTK: problem with 'L' in 'guioptions' changing the window width.
 (Aaron Cornelius, 2012 Feb 6)
 
-Configure change to detect Lua 5.2. (lilydjwg, 2013 Jan 31)
-
 Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
 
-Patch to avoid warnings in Perl code. (Christian Brabandt, 2013 Jan 30)
-
-The " mark is not updated for lines inserted above it. (Roland Eggner, 2013
-Feb 5)
-
-Look into patch to add 'linenumber' option. (Nazri Ramliy, 2013 Feb 4)
-
-Another patch for Python threads, 2 and 3. (Ken Takata, 2013 Jan 31)
-Does this really work?
-
-Patch for 'relativenumber' being reset unexpectedly. (Christian Brabandt, 2013
-Feb 1)  Tests Feb 2.
-
-Patch to avoid useless compare. (Hayaki Saito, 2013 Feb 2)
+Patch to trigger CompleteDone when there are no pattern matches. (Christian
+Brabandt, 2013 Feb 7)
 
 The CompleteDone autocommand needs some info passed to it:
 - The word that was selected (empty if abandoned complete)
@@ -107,12 +89,21 @@ Patch for Win32 clipboard under Cygwin. (Frodak Baksik, Feb 15)
 Problem parsing expression with function(). (Andy Wokula, 2012 Nov 22)
 Patch by Christian Brabandt, Nov 22.  Tests in another patch, Nov 23.
 
+Patch to detect value of 'ambiwidth' from the termresponse.
+(Hayaki Saito, 2013 Feb 11)
+
+Matchparen does not update match when indenting. (Marc Aldorasi, 2013 Feb 9)
+
 Patch to add default value to getbufvar() et al. (Shougo Matsushita, Hirohito
 Higashi, 2013 Jan 1)
 
 Problem caused by patch 7.3.638: window->open does not update window
 correctly. Issue 91.
 
+Patch to add argument to bufname() to only consider buffers in the current
+tab.  (Alexey Radkov, 2013 Feb 8)  Example in later email.
+Is this right?
+
 Patch to fix compiler warnings for MingW 4.5.3. (Ken Takata, 2013 Jan 26)
 
 Do allow real tags above the !_TAG entries. Undo older patch. Issue 90.
@@ -378,9 +369,6 @@ The error was 'RenderBadPicture (invalid Picture parameter)'.
    backtrace from your debugger if you break on the gdk_x_error() function.)
 Check that number of pixels doesn't go above 65535?
 
-popup completion menu closes quickly when there is a fold in the buffer. (Jan
-Christoph Ebersbach, 2011 Jul 3)
-
 Windows keys not set properly on Windows 7?  (cncyber, 2010 Aug 26)
 
 When using a Vim server, a # in the path causes an error message.
@@ -1592,9 +1580,6 @@ resulting in highlighted "{" in that window, not in the other.
 In mswin.vim: Instead of mapping <C-V> for Insert mode in a complicated way,
 can it be done like ":imap <C-V> <MiddleMouse>" without negative side effects?
 
-Completion menu disappears when using 'cursorcolumn'. (Sven-Hendrik Haase,
-2011 May 23)
-
 GTK: when the Tab pages bar appears or disappears while the window is
 maximized the window is no longer maximized.  Patch that has some idea but
 doesn't work from Geoffrey Antos, 2008 May 5.
diff --git a/runtime/doc/usr_08.txt b/runtime/doc/usr_08.txt
index 9a9280203b5c016eaa26b4274cf6dfb4c5886ea7..a9194ab714163c7988edd8db2f453ac407c25320 100644
--- a/runtime/doc/usr_08.txt
+++ b/runtime/doc/usr_08.txt
@@ -17,7 +17,7 @@ side by side.  All this is possible with split windows.
 |08.6|	Commands for all windows
 |08.7|	Viewing differences with vimdiff
 |08.8|	Various
-|08.9|  Tab pages
+|08.9|	Tab pages
 
      Next chapter: |usr_09.txt|  Using the GUI
  Previous chapter: |usr_07.txt|  Editing more than one file
diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt
index 8a02838d594ce969d236b2486d68bcfe16d297e2..ea654166f02a355de30e0efa23a0353d8b4fd510 100644
--- a/runtime/doc/usr_28.txt
+++ b/runtime/doc/usr_28.txt
@@ -18,7 +18,7 @@ This chapter explains the different ways this can be done.
 |28.7|	Folding by syntax
 |28.8|	Folding by expression
 |28.9|	Folding unchanged lines
-|28.10| Which fold method to use?
+|28.10|	Which fold method to use?
 
      Next chapter: |usr_29.txt|  Moving through programs
  Previous chapter: |usr_27.txt|  Search commands and patterns
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 08270f1702d41884cb7a7f8a0d9ea35c5c4d903f..7a5c1526badf0cefcc708f5b1a295874d67e9519 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2013 Jan 31
+" Last Change:	2013 Feb 12
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -1079,6 +1079,9 @@ au BufNewFile,BufRead *[mM]akefile,*.mk,*.mak,*.dsp setf make
 " MakeIndex
 au BufNewFile,BufRead *.ist,*.mst		setf ist
 
+" Mallard
+au BufNewFile,BufRead *.page			setf mallard
+
 " Manpage
 au BufNewFile,BufRead *.man			setf man
 
diff --git a/runtime/ftplugin/lisp.vim b/runtime/ftplugin/lisp.vim
index dcc248c9ce78431b9f1f0b3ceefa9c38b0de77e1..8bf6ae411c660a8233ce91e61b5df3334229a235 100644
--- a/runtime/ftplugin/lisp.vim
+++ b/runtime/ftplugin/lisp.vim
@@ -4,7 +4,7 @@
 " URL:		 http://sites.google.com/site/khorser/opensource/vim
 " Original author:    Dorai Sitaram <ds26@gte.com>
 " Original URL:		 http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
-" Last Change:   Mar 5, 2012
+" Last Change:   Feb 12, 2013
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -19,10 +19,11 @@ setl define=^\\s*(def\\k*
 setl formatoptions-=t
 setl iskeyword+=+,-,*,/,%,<,=,>,:,$,?,!,@-@,94
 setl lisp
+setl commentstring=;%s
 
 " make comments behaviour like in c.vim
 " e.g. insertion of ;;; and ;; on normal "O" or "o" when staying in comment
 setl comments^=:;;;,:;;,sr:#\|,mb:\|,ex:\|#
 setl formatoptions+=croql
 
-let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp<"
+let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp< commentstring<"
diff --git a/runtime/ftplugin/scheme.vim b/runtime/ftplugin/scheme.vim
index 9b271936e81f47e6d199b29a6f4e913ee471a0a7..7f3f63720dcfcf314f77cb6213968d6197fe02b7 100644
--- a/runtime/ftplugin/scheme.vim
+++ b/runtime/ftplugin/scheme.vim
@@ -4,7 +4,7 @@
 " URL:		 http://sites.google.com/site/khorser/opensource/vim
 " Original author:    Dorai Sitaram <ds26@gte.com>
 " Original URL:		 http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
-" Last Change:   Mar 5, 2012
+" Last Change:   Feb 12, 2013
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -20,6 +20,7 @@ setl define=^\\s*(def\\k*
 setl formatoptions-=t
 setl iskeyword+=+,-,*,/,%,<,=,>,:,$,?,!,@-@,94
 setl lisp
+setl commentstring=;%s
 
 " make comments behaviour like in c.vim
 " e.g. insertion of ;;; and ;; on normal "O" or "o" when staying in comment
@@ -44,4 +45,4 @@ if exists("b:is_chicken") || exists("is_chicken")
     setl lispwords+=cond-expand,and-let*,foreign-lambda,foreign-lambda*
 endif
 
-let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lispwords< lisp<"
+let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lispwords< lisp< commentstring<"
diff --git a/runtime/spell/br/br_FR.diff b/runtime/spell/br/br_FR.diff
index 4c890dfa58b30d163c522441f40da22e40c570c7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/runtime/spell/br/br_FR.diff
+++ b/runtime/spell/br/br_FR.diff
@@ -1,23 +0,0 @@
-*** br_FR.aff.orig	2012-08-01 22:40:24.000000000 +0200
---- br_FR.aff	2012-08-01 22:46:03.028851510 +0200
-***************
-*** 13,20 ****
-  SET UTF-8
-  TRY esiaùnñrtolcdugmphbyfvkwzESIAÙNÑRTOLCDUGMPHBYFVKWZ'
-  
-  # Permet à l'utilitaire en ligne de commande hunspell de fonctionner avec les mots contenant des quotes (lec'hienn, ...)
-! WORDCHARS '
-  
-  FLAG long
-  
---- 13,22 ----
-  SET UTF-8
-  TRY esiaùnñrtolcdugmphbyfvkwzESIAÙNÑRTOLCDUGMPHBYFVKWZ'
-  
-+ MIDWORD '
-+ 
-  # Permet à l'utilitaire en ligne de commande hunspell de fonctionner avec les mots contenant des quotes (lec'hienn, ...)
-! WORDCHARS '-
-  
-  FLAG long
-  
diff --git a/runtime/spell/br/main.aap b/runtime/spell/br/main.aap
index 255dac7b53f5a3bc39feaac77d6515a907061db0..75035be037f506feb7bb949789c412bba08e01f4 100644
--- a/runtime/spell/br/main.aap
+++ b/runtime/spell/br/main.aap
@@ -25,16 +25,16 @@ $SPELLDIR/br.utf-8.spl : $FILES
 #
 # Fetching the files from OpenOffice.org.
 #
-OODIR = http://extensions.services.openoffice.org/e-files/2207/6
-:attr {fetch = $OODIR/%file%} dict-br_0.8.oxt
+OODIR = http://extensions.libreoffice.org/extension-center/an-drouizig-breton-spellchecker/releases/0.11/
+:attr {fetch = $OODIR/%file%} dict-br-0.11.oxt
 
 # The files don't depend on the .zip file so that we can delete it.
 # Only download the zip file if the targets don't exist.
 br_FR.aff br_FR.dic: {buildcheck=}
         :assertpkg unzip patch
-        :fetch dict-br_0.8.oxt
-        :sys $UNZIP dict-br_0.8.oxt
-        :delete dict-br_0.8.oxt
+        :fetch dict-br-0.11.oxt
+        :sys $UNZIP dict-br-0.11.oxt
+        :delete dict-br-0.11.oxt
         :copy dictionaries/br_FR.aff br_FR.aff
         :copy dictionaries/br_FR.dic br_FR.dic
         # The br_FR.aff file contains a BOM, remove it.
@@ -65,12 +65,12 @@ diff:
 
 check:
         :assertpkg unzip diff
-        :fetch dict-br_0.8.oxt
+        :fetch dict-br-0.11.oxt
         :mkdir tmp
         :cd tmp
         @try:
             @import stat
-            :sys $UNZIP ../dict-br_0.8.oxt
+            :sys $UNZIP ../dict-br-0.11.oxt
             :sys {force} diff ../dictionaries/br_FR.aff br_FR.aff >d
             @if os.stat('d')[stat.ST_SIZE] > 0:
                 :copy br_FR.aff ../br_FR.new.aff
@@ -80,7 +80,7 @@ check:
         @finally:
             :cd ..
             :delete {r}{f}{q} tmp
-            :delete dict-br_0.8.oxt
+            :delete dict-br-0.11.oxt
 
 
 # vim: set sts=4 sw=4 :
diff --git a/runtime/syntax/mallard.vim b/runtime/syntax/mallard.vim
new file mode 100644
index 0000000000000000000000000000000000000000..b2a77b00668be952f8c15e07b68f2811865102fb
--- /dev/null
+++ b/runtime/syntax/mallard.vim
@@ -0,0 +1,37 @@
+" Vim syntax file
+" Language:    Mallard
+" Maintainer:  Jaromir Hradilek <jhradilek@gmail.com>
+" URL:         https://github.com/jhradilek/vim-syntax
+" Last Change: 11 February 2013
+" Description: A syntax file for the Mallard markup language according to
+"              Mallard 1.0 DRAFT as of 2013-02-11.
+
+if exists("b:current_syntax")
+  finish
+endif
+
+do Syntax xml
+syn cluster xmlTagHook add=mallardTagName
+syn spell toplevel
+syn case match
+
+syn keyword mallardTagName app cite cmd code col colgroup comment contained
+syn keyword mallardTagName credit desc em email example figure contained
+syn keyword mallardTagName file gui guiseq info input item key contained
+syn keyword mallardTagName keyseq license link links list listing contained
+syn keyword mallardTagName media name note output p page quote contained
+syn keyword mallardTagName revision screen section span steps contained
+syn keyword mallardTagName subtitle synopsis sys table tbody td contained
+syn keyword mallardTagName terms tfoot thead title tr tree var contained
+syn keyword mallardTagName years contained
+
+syn region mallardComment start="<comment\>" end="</comment>"me=e-10 contains=xmlTag,xmlNamespace,xmlTagName,xmlEndTag,xmlRegion,xmlEntity,@Spell keepend
+syn region mallardEmphasis start="<em\>" end="</em>"me=e-5 contains=xmlTag,xmlNamespace,xmlTagName,xmlEndTag,xmlRegion,xmlEntity,@Spell keepend
+syn region mallardTitle start="<title\>" end="</title>"me=e-8 contains=xmlTag,xmlNamespace,xmlTagName,xmlEndTag,xmlRegion,xmlEntity,@Spell keepend
+
+hi def link mallardComment  Comment
+hi def link mallardTagName  Statement
+hi def link mallardTitle    Title
+hi def mallardEmphasis term=italic cterm=italic gui=italic
+
+let b:current_syntax = "mallard"
diff --git a/runtime/syntax/pine.vim b/runtime/syntax/pine.vim
index 749535e1ad17d8f01d6415dd5adc1ac554ef6cb9..4c64b9bbc7b16613f19284c8b34c449c13f90426 100644
--- a/runtime/syntax/pine.vim
+++ b/runtime/syntax/pine.vim
@@ -12,9 +12,9 @@ elseif exists("b:current_syntax")
 endif
 
 if version >= 600
-  setlocal iskeyword=@,48-57,_,128-167,224-235,-,
+  setlocal iskeyword=@,48-57,_,128-167,224-235,-
 else
-  set iskeyword=@,48-57,_,128-167,224-235,-,
+  set iskeyword=@,48-57,_,128-167,224-235,-
 endif
 
 syn keyword pineConfig addrbook-sort-rule
diff --git a/runtime/tutor/tutor.ja.euc b/runtime/tutor/tutor.ja.euc
index 9eabbdc401a65cc91136740a4c90076fff729d6d..4e62c7060fb826d3bf8cf77b8bed02a4514942eb 100644
--- a/runtime/tutor/tutor.ja.euc
+++ b/runtime/tutor/tutor.ja.euc
@@ -126,8 +126,8 @@ NOTE: 
 
   3. ¥Æ¥­¥¹¥È¤òÄɲä·½ª¤¨¤¿¤é¡¢ <ESC> ¤ò²¡¤·¤Æ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤ËÌá¤ê¤Þ¤·¤ç¤¦¡£
 
-  4. 2¹ÔÌܤΠ---> ¤È¼¨¤µ¤ì¤¿¾ì½ê¤Ø°ÜÆ°¤·¡¢¥¹¥Æ¥Ã¥× 2 ¤«¤é 3 ·«¤êÊÖ¤·¤Æʸˡ¤ò
-     ½¤Àµ¤·¤Þ¤·¤ç¤¦¡£
+  4. 2¹ÔÌܤΠ---> ¤È¼¨¤µ¤ì¤¿¾ì½ê¤Ø°ÜÆ°¤·¡¢¥¹¥Æ¥Ã¥× 2 ¤«¤é 3 ¤ò·«¤êÊÖ¤·¤Æʸˡ
+     ¤ò½¤Àµ¤·¤Þ¤·¤ç¤¦¡£
 
 ---> ¤³¤³¤Ë¤Ï´Ö°ã¤Ã¤¿¥Æ¥­¥¹¥È¤¬¤¢¤ê
      ¤³¤³¤Ë¤Ï´Ö°ã¤Ã¤¿¥Æ¥­¥¹¥È¤¬¤¢¤ê¤Þ¤¹¡£
@@ -215,7 +215,7 @@ NOTE: <ESC> 
 
   2. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
 
-  3. Àµ¤·¤¤Ê¸¤ÎËöÈø¤Ø¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦(ºÇ½é¤Î . ¤Î¸å¤Ç¤¹)¡£
+  3. Àµ¤·¤¤Ê¸¤ÎËöÈø¤Ø¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦(ºÇ½é¤Î ¡£ ¤Î¸å¤Ç¤¹)¡£
 
   4. ¹ÔËö¤Þ¤Çºï½ü¤¹¤ë¤Î¤Ë d$ ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£
 
@@ -265,7 +265,7 @@ NOTE: 
 
   4. 0 (¥¼¥í)¤ò¥¿¥¤¥×¤·¤Æ¹ÔƬ¤Ë°ÜÆ°¤·¤Þ¤¹¡£
 
-  5. ¥¹¥Æ¥Ã¥× 2 ¤È 3 ¤ò°ã¤¦¿ôÃͤȻȤäƷ«¤êÊÖ¤·¤Þ¤¹¡£
+  5. ¥¹¥Æ¥Ã¥× 2 ¤È 3 ¤ò°ã¤¦¿ôÃͤò»È¤Ã¤Æ·«¤êÊÖ¤·¤Þ¤¹¡£
 
 ---> This is just a line with words you can move around in.
 
@@ -747,7 +747,7 @@ NOTE: 
 
   3. ¥«¡¼¥½¥ë¤Î¸å¤í¤Ë¥Æ¥­¥¹¥È¤òÄɲ乤뤿¤á¤Ë a (¾®Ê¸»ú) ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£
 
-  4. ¤½¤Î²¼¤Î¹Ô¤Î¤Î¤è¤¦¤Êñ¸ì¤Ë´°À®¤µ¤»¤Þ¤¹¡£ÁÞÆþ¥â¡¼¥É¤òÈ´¤±¤ë°Ù¤Ë <ESC> ¤Ë²¡
+  4. ¤½¤Î²¼¤Î¹Ô¤Î¤è¤¦¤Êñ¸ì¤Ë´°À®¤µ¤»¤Þ¤¹¡£ÁÞÆþ¥â¡¼¥É¤òÈ´¤±¤ë°Ù¤Ë <ESC> ¤ò²¡
      ¤·¤Þ¤¹¡£
 
   5. e ¤ò»È¤Ã¤Æ¼¡¤ÎÉÔ´°Á´¤Êñ¸ì¤Ø°ÜÆ°¤·¡¢¥¹¥Æ¥Ã¥× 3 ¤È 4 ¤ò·«¤êÊÖ¤·¤Þ¤¹¡£
@@ -878,7 +878,7 @@ Note: 1
 
 			 ** Vim ¤ÎÆÃħ¤òȯ´ø¤¹¤ë **
 
-  Vim ¤Ë¤Ï Vi ¤è¤ê¤â¿¤¯¤ÎÆÃħ¤òƧ¤Þ¤¨¤Æ¤¤¤Þ¤¬¡¢¤½¤Î¤Û¤È¤ó¤É¤Ï½é´ü¾õÂ֤ˤÆ
+  Vim ¤Ë¤Ï Vi ¤è¤ê¤â¿¤¯¤ÎÆÃħ¤òƧ¤Þ¤¨¤Æ¤¤¤Þ¤¹¤¬¡¢¤½¤Î¤Û¤È¤ó¤É¤Ï½é´ü¾õÂ֤ˤÆ
   »ÈÍÑÉԲĤȤʤäƤ¤¤Þ¤¹¡£¤è¤ê¿¤¯¤ÎÆÃħ¤ò»È¤¤¤Ï¤¸¤á¤ë¤Ë¤Ï "vimrc" ¥Õ¥¡¥¤¥ë
   ¤òºîÀ®¤·¤Þ¤¹¡£
 
diff --git a/runtime/tutor/tutor.ja.sjis b/runtime/tutor/tutor.ja.sjis
index baf81129f1da1864ea781d63063bfc2c6d9f7203..7a932fa756403219fe880520b62e26b9b685d7e7 100644
--- a/runtime/tutor/tutor.ja.sjis
+++ b/runtime/tutor/tutor.ja.sjis
@@ -126,8 +126,8 @@ NOTE: 
 
   3. ƒeƒLƒXƒg‚ð’ljÁ‚µI‚¦‚½‚çA <ESC> ‚ð‰Ÿ‚µ‚ăm[ƒ}ƒ‹ƒ‚[ƒh‚É–ß‚è‚Ü‚µ‚傤B
 
-  4. 2s–Ú‚Ì ---> ‚ÆŽ¦‚³‚ꂽêŠ‚ÖˆÚ“®‚µAƒXƒeƒbƒv 2 ‚©‚ç 3 ŒJ‚è•Ô‚µ‚Ä•¶–@‚ð
-     C³‚µ‚Ü‚µ‚傤B
+  4. 2s–Ú‚Ì ---> ‚ÆŽ¦‚³‚ꂽêŠ‚ÖˆÚ“®‚µAƒXƒeƒbƒv 2 ‚©‚ç 3 ‚ðŒJ‚è•Ô‚µ‚Ä•¶–@
+     ‚ðC³‚µ‚Ü‚µ‚傤B
 
 ---> ‚±‚±‚É‚ÍŠÔˆá‚Á‚½ƒeƒLƒXƒg‚ª‚ ‚è
      ‚±‚±‚É‚ÍŠÔˆá‚Á‚½ƒeƒLƒXƒg‚ª‚ ‚è‚Ü‚·B
@@ -215,7 +215,7 @@ NOTE: <ESC> 
 
   2. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B
 
-  3. ³‚µ‚¢•¶‚Ì––”ö‚ÖƒJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤(Å‰‚Ì . ‚ÌŒã‚Å‚·)B
+  3. ³‚µ‚¢•¶‚Ì––”ö‚ÖƒJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤(Å‰‚Ì B ‚ÌŒã‚Å‚·)B
 
   4. s––‚܂ō폜‚·‚é‚Ì‚É d$ ‚ƃ^ƒCƒv‚µ‚Ü‚µ‚傤B
 
@@ -265,7 +265,7 @@ NOTE: 
 
   4. 0 (ƒ[ƒ)‚ðƒ^ƒCƒv‚µ‚čs“ª‚Ɉړ®‚µ‚Ü‚·B
 
-  5. ƒXƒeƒbƒv 2 ‚Æ 3 ‚ðˆá‚¤”’l‚ÆŽg‚Á‚ÄŒJ‚è•Ô‚µ‚Ü‚·B
+  5. ƒXƒeƒbƒv 2 ‚Æ 3 ‚ðˆá‚¤”’l‚ðŽg‚Á‚ÄŒJ‚è•Ô‚µ‚Ü‚·B
 
 ---> This is just a line with words you can move around in.
 
@@ -747,7 +747,7 @@ NOTE: 
 
   3. ƒJ[ƒ\ƒ‹‚ÌŒã‚ë‚ɃeƒLƒXƒg‚ð’ljÁ‚·‚邽‚ß‚É a (¬•¶Žš) ‚ðƒ^ƒCƒv‚µ‚Ü‚·B
 
-  4. ‚»‚̉º‚̍s‚̂̂悤‚È’PŒê‚ÉŠ®¬‚³‚¹‚Ü‚·B‘}“üƒ‚[ƒh‚𔲂¯‚éˆ×‚É <ESC> ‚ɉŸ
+  4. ‚»‚̉º‚̍s‚̂悤‚È’PŒê‚ÉŠ®¬‚³‚¹‚Ü‚·B‘}“üƒ‚[ƒh‚𔲂¯‚éˆ×‚É <ESC> ‚ð‰Ÿ
      ‚µ‚Ü‚·B
 
   5. e ‚ðŽg‚Á‚ÄŽŸ‚Ì•sŠ®‘S‚È’PŒê‚ÖˆÚ“®‚µAƒXƒeƒbƒv 3 ‚Æ 4 ‚ðŒJ‚è•Ô‚µ‚Ü‚·B
@@ -878,7 +878,7 @@ Note: 1
 
 			 ** Vim ‚Ì“Á’¥‚ð”­Šö‚·‚é **
 
-  Vim ‚É‚Í Vi ‚æ‚è‚à‘½‚­‚Ì“Á’¥‚𓥂܂¦‚Ä‚¢‚Ü‚ªA‚»‚Ì‚Ù‚Æ‚ñ‚ǂ͏‰Šúó‘Ô‚É‚Ä
+  Vim ‚É‚Í Vi ‚æ‚è‚à‘½‚­‚Ì“Á’¥‚𓥂܂¦‚Ä‚¢‚Ü‚·‚ªA‚»‚Ì‚Ù‚Æ‚ñ‚ǂ͏‰Šúó‘Ô‚É‚Ä
   Žg—p•s‰Â‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B‚æ‚葽‚­‚Ì“Á’¥‚ðŽg‚¢‚Í‚¶‚ß‚é‚É‚Í "vimrc" ƒtƒ@ƒCƒ‹
   ‚ðì¬‚µ‚Ü‚·B
 
diff --git a/runtime/tutor/tutor.ja.utf-8 b/runtime/tutor/tutor.ja.utf-8
index 2034443c23dbe0e2e1ba2ddfc4459cd9f236bcf4..4b7d2a08af5fa7e983a69b7e68068a4e01756b1f 100644
--- a/runtime/tutor/tutor.ja.utf-8
+++ b/runtime/tutor/tutor.ja.utf-8
@@ -126,8 +126,8 @@ NOTE: 全てのレッスンを通じて、覚えようとするのではなく
 
   3. テキストを追加し終えたら、 <ESC> を押してノーマルモードに戻りましょう。
 
-  4. 2行目の ---> と示された場所へ移動し、ステップ 2 から 3 繰り返して文法を
-     修正しましょう。
+  4. 2行目の ---> と示された場所へ移動し、ステップ 2 から 3 を繰り返して文法
+     を修正しましょう。
 
 ---> ここには間違ったテキストがあり
      ここには間違ったテキストがあります。
@@ -215,7 +215,7 @@ NOTE: <ESC> キーを押すとノーマルモードに移行します。その
 
   2. 以下の ---> と示された行にカーソルを移動しましょう。
 
-  3. 正しい文の末尾へカーソルを移動しましょう(最初の . の後です)。
+  3. 正しい文の末尾へカーソルを移動しましょう(最初の 。 の後です)。
 
   4. 行末まで削除するのに d$ とタイプしましょう。
 
@@ -265,7 +265,7 @@ NOTE: 冒険したい人は、ノーマルモードにてコマンドなしに
 
   4. 0 (ゼロ)をタイプして行頭に移動します。
 
-  5. ステップ 2 と 3 を違う数値と使って繰り返します。
+  5. ステップ 2 と 3 を違う数値を使って繰り返します。
 
 ---> This is just a line with words you can move around in.
 
@@ -747,7 +747,7 @@ NOTE: 外部コマンドの出力を読み込むことも出来ます。例え
 
   3. カーソルの後ろにテキストを追加するために a (小文字) をタイプします。
 
-  4. その下の行ののような単語に完成させます。挿入モードを抜ける為に <ESC> に押
+  4. その下の行のような単語に完成させます。挿入モードを抜ける為に <ESC> を押
      します。
 
   5. e を使って次の不完全な単語へ移動し、ステップ 3 と 4 を繰り返します。
@@ -878,7 +878,7 @@ Note: 1つの検索コマンドだけ大文字小文字の区別をやめたい
 
 			 ** Vim の特徴を発揮する **
 
-  Vim には Vi よりも多くの特徴を踏まえていまが、そのほとんどは初期状態にて
+  Vim には Vi よりも多くの特徴を踏まえていますが、そのほとんどは初期状態にて
   使用不可となっています。より多くの特徴を使いはじめるには "vimrc" ファイル
   を作成します。
 
diff --git a/src/po/eo.po b/src/po/eo.po
index 82884f1202b55692a89e49bdd1cb4c7fe3fe7631..63d73911af1a502657428a43d18cb74f14ff25c0 100644
--- a/src/po/eo.po
+++ b/src/po/eo.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Esperanto)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 06:35+0200\n"
-"PO-Revision-Date: 2012-08-19 06:41+0200\n"
+"POT-Creation-Date: 2013-02-10 14:05+0100\n"
+"PO-Revision-Date: 2013-02-10 14:23+0100\n"
 "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: eo\n"
@@ -259,7 +259,7 @@ msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: Bufro ŝanĝiĝis neatendite"
 
 msgid "E104: Escape not allowed in digraph"
-msgstr "E104: Eskapsigno malpermesita en duliteraĵo"
+msgstr "E104: Eskapsigno nepermesebla en duliteraĵo"
 
 msgid "E544: Keymap file not found"
 msgstr "E544: Dosiero de klavmapo ne troveblas"
@@ -631,7 +631,7 @@ msgid "insert() argument"
 msgstr "argumento de insert()"
 
 msgid "E786: Range not allowed"
-msgstr "E786: Amplekso malpermesita"
+msgstr "E786: Amplekso nepermesebla"
 
 msgid "E701: Invalid type for len()"
 msgstr "E701: Nevalida datumtipo de len()"
@@ -965,7 +965,7 @@ msgid "E144: non-numeric argument to :z"
 msgstr "E144: nenumera argumento de :z"
 
 msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: Åœelkomandoj ne permesataj en rvim"
+msgstr "E145: Åœelkomandoj nepermeseblaj en rvim"
 
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Ne eblas limigi regulesprimon per literoj"
@@ -1257,7 +1257,7 @@ msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: BedaÅ­rinde, tiu komando ne haveblas en tiu versio"
 
 msgid "E172: Only one file name allowed"
-msgstr "E172: Nur unu dosiernomo permesita"
+msgstr "E172: Nur unu dosiernomo permesebla"
 
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "1 plia redaktenda dosiero. Ĉu tamen eliri?"
@@ -1325,7 +1325,7 @@ msgstr "E180: Nevalida valoro de kompletigo: %s"
 
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr ""
-"E468: Argumento de kompletigo nur permesata por kompletigo difinita de uzanto"
+"E468: Argumento de kompletigo nur permesebla por kompletigo difinita de uzanto"
 
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: Uzula kompletigo bezonas funkcian argumenton"
@@ -1334,8 +1334,8 @@ msgid "unknown"
 msgstr "nekonata"
 
 #, c-format
-msgid "E185: Cannot find color scheme %s"
-msgstr "E185: Ne eblas trovi agordaron de koloroj %s"
+msgid "E185: Cannot find color scheme '%s'"
+msgstr "E185: Ne eblas trovi agordaron de koloroj '%s'"
 
 msgid "Greetings, Vim user!"
 msgstr "Bonvenon, uzanto de Vim!"
@@ -1561,7 +1561,7 @@ msgid "E193: :endfunction not inside a function"
 msgstr "E193: \":endfunction\" ekster funkcio"
 
 msgid "E788: Not allowed to edit another buffer now"
-msgstr "E788: Nun malpermesas redakti alian bufron"
+msgstr "E788: Ne eblas redakti alian bufron nun"
 
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811: Ne eblas ŝanĝi informon de bufro nun"
@@ -2257,7 +2257,7 @@ msgstr "E252: Nomo de tiparo: %s"
 
 #, c-format
 msgid "Font '%s' is not fixed-width"
-msgstr "Tiparo \"%s\" ne estas egallarĝa"
+msgstr "Tiparo '%s' ne estas egallarĝa"
 
 #, c-format
 msgid "E253: Fontset name: %s\n"
@@ -2617,6 +2617,9 @@ msgstr "ne eblas enmeti linion"
 msgid "string cannot contain newlines"
 msgstr "ĉeno ne rajtas enhavi liniavancojn"
 
+msgid "error converting Scheme values to Vim"
+msgstr "eraro dum konverto de Scheme-valoro al Vim"
+
 msgid "Vim error: ~a"
 msgstr "Eraro de Vim: ~a"
 
@@ -2633,14 +2636,13 @@ msgid "linenr out of range"
 msgstr "numero de linio ekster limoj"
 
 msgid "not allowed in the Vim sandbox"
-msgstr "nepermesita en sabloludejo de Vim"
+msgstr "nepermesebla en sabloludejo de Vim"
 
 msgid "E836: This Vim cannot execute :python after using :py3"
 msgstr "E836: Vim ne povas plenumi :python post uzo de :py3"
 
-#. Add conversion from PyInt?
 msgid "only string keys are allowed"
-msgstr "nur ĉenaj ŝlosiloj estas permisataj"
+msgstr "nur ĉenaj ŝlosiloj estas permeseblaj"
 
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
@@ -2658,15 +2660,6 @@ msgstr "E858: Eval ne revenis kun valida python-objekto"
 msgid "E859: Failed to convert returned python object to vim value"
 msgstr "E859: Konverto de revena python-objekto al vim-valoro fiaskis"
 
-msgid "can't delete OutputObject attributes"
-msgstr "ne eblas forviŝi atributojn de OutputObject"
-
-msgid "softspace must be an integer"
-msgstr "malmolspaceto (softspace) devas esti entjero"
-
-msgid "invalid attribute"
-msgstr "nevalida atributo"
-
 #, c-format
 msgid "<buffer object (deleted) at %p>"
 msgstr "<bufra objekto (forviŝita) ĉe %p>"
@@ -3044,10 +3037,10 @@ msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\tLimigita reĝimo (kiel \"rvim\")"
 
 msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\tŜanĝoj (skribo al dosieroj) malpermesitaj"
+msgstr "-m\t\t\tŜanĝoj (skribo al dosieroj) nepermeseblaj"
 
 msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\tŜanĝoj al teksto malpermesitaj"
+msgstr "-M\t\t\tŜanĝoj al teksto nepermeseblaj"
 
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\tDuuma reĝimo"
@@ -4303,7 +4296,7 @@ msgid "E519: Option not supported"
 msgstr "E519: Opcio ne subtenata"
 
 msgid "E520: Not allowed in a modeline"
-msgstr "E520: Ne permesita en reĝimlinio"
+msgstr "E520: Nepermesebla en reĝimlinio"
 
 msgid "E846: Key code not set"
 msgstr "E846: Klavkodo ne agordita"
@@ -4531,7 +4524,7 @@ msgstr "E238: Eraro de presado: %s"
 
 #, c-format
 msgid "Printing '%s'"
-msgstr "Presas \"%s\""
+msgstr "Presas '%s'"
 
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
@@ -4817,11 +4810,11 @@ msgid "E65: Illegal back reference"
 msgstr "E65: Nevalida retro-referenco"
 
 msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( estas malpermesa tie"
+msgstr "E66: \\z( estas permesebla tie"
 
 # DP: vidu http://www.thefreedictionary.com/et+al.
 msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 kaj aliaj estas malpermesataj tie"
+msgstr "E67: \\z1 kaj aliaj estas nepermeseblaj tie"
 
 msgid "E68: Invalid character after \\z"
 msgstr "E68: Nevalida signo malantaÅ­ \\z"
@@ -5470,7 +5463,7 @@ msgstr "E406: Malplena argumento: %s"
 
 #, c-format
 msgid "E407: %s not allowed here"
-msgstr "E407: %s ne estas permesata tie"
+msgstr "E407: %s ne estas permesebla tie"
 
 #, c-format
 msgid "E408: %s must be first in contains list"
@@ -5807,7 +5800,7 @@ msgid "%ld seconds ago"
 msgstr "antaÅ­ %ld sekundoj"
 
 msgid "E790: undojoin is not allowed after undo"
-msgstr "E790: undojoin estas nepermesita malantaÅ­ malfaro"
+msgstr "E790: undojoin estas nepermesebla malantaÅ­ malfaro"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: listo de malfaro estas difekta"
@@ -6240,7 +6233,7 @@ msgstr ""
 
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
-"E12: Malpermesata komando el exrc/vimrc en aktuala dosierujo aŭ etikeda serĉo"
+"E12: Nepermesebla komando el exrc/vimrc en aktuala dosierujo aŭ etikeda serĉo"
 
 msgid "E171: Missing :endif"
 msgstr "E171: Mankas \":endif\""
@@ -6335,7 +6328,7 @@ msgid "E24: No such abbreviation"
 msgstr "E24: Ne estas tia mallongigo"
 
 msgid "E477: No ! allowed"
-msgstr "E477: Neniu ! permesita"
+msgstr "E477: Neniu ! permesebla"
 
 msgid "E25: GUI cannot be used: Not enabled at compile time"
 msgstr "E25: Grafika interfaco ne uzeblas: Malŝaltita dum kompilado"
@@ -6382,7 +6375,7 @@ msgid "E35: No previous regular expression"
 msgstr "E35: Neniu antaÅ­a regulesprimo"
 
 msgid "E481: No range allowed"
-msgstr "E481: Amplekso ne permesita"
+msgstr "E481: Amplekso nepermesebla"
 
 msgid "E36: Not enough room"
 msgstr "E36: Ne sufiĉe da spaco"
@@ -6465,10 +6458,10 @@ msgid "E47: Error while reading errorfile"
 msgstr "E47: Eraro dum legado de erardosiero"
 
 msgid "E48: Not allowed in sandbox"
-msgstr "E48: Ne permesita en sabloludejo"
+msgstr "E48: Nepermesebla en sabloludejo"
 
 msgid "E523: Not allowed here"
-msgstr "E523: Ne permesita tie"
+msgstr "E523: Nepermesebla tie"
 
 msgid "E359: Screen mode setting not supported"
 msgstr "E359: Reĝimo de ekrano ne subtenata"
@@ -6566,6 +6559,15 @@ msgstr "serĉo atingis SUBON, daŭrigonte al SUPRO"
 msgid "Need encryption key for \"%s\""
 msgstr "Ŝlosilo de ĉifrado bezonata por \"%s\""
 
+msgid "can't delete OutputObject attributes"
+msgstr "ne eblas forviŝi atributojn de OutputObject"
+
+msgid "softspace must be an integer"
+msgstr "malmolspaceto (softspace) devas esti entjero"
+
+msgid "invalid attribute"
+msgstr "nevalida atributo"
+
 msgid "writelines() requires list of strings"
 msgstr "writelines() bezonas liston de ĉenoj"
 
@@ -6575,15 +6577,30 @@ msgstr "E264: Pitono: Eraro de pravalorizo de eneligaj objektoj"
 msgid "no such buffer"
 msgstr "ne estas tia bufro"
 
+msgid "empty keys are not allowed"
+msgstr "malplenaj ŝlosiloj nepermeseblaj"
+
 msgid "failed to add key to dictionary"
 msgstr "aldono de ŝlosilo al vortaro fiaskis"
 
-msgid "dict is locked"
-msgstr "vortaro estas ŝlosita"
+msgid "Cannot delete DictionaryObject attributes"
+msgstr "ne eblas forviŝi atributojn de DictionaryObject"
+
+msgid "Cannot modify fixed dictionary"
+msgstr "Ne eblas ŝanĝi fiksan vortaron"
+
+msgid "Only boolean objects are allowed"
+msgstr "Nur buleaj objektoj estas permeseblaj"
+
+msgid "Cannot set this attribute"
+msgstr "Ne eblas agordi tiun atributon"
 
 msgid "no such key in dictionary"
 msgstr "tiu ŝlosilo ne ekzistas en vortaro"
 
+msgid "dict is locked"
+msgstr "vortaro estas ŝlosita"
+
 msgid "internal error: failed to get vim list item"
 msgstr "interna eraro: obteno de vim-a listero fiaskis"
 
@@ -6605,6 +6622,9 @@ msgstr "interna eraro: aldono de listero fiaskis"
 msgid "can only concatenate with lists"
 msgstr "eblas nur kunmeti kun listoj"
 
+msgid "Cannot modify fixed list"
+msgstr "Ne eblas ŝanĝi fiksan liston"
+
 msgid "'self' argument must be a dictionary"
 msgstr "argumento 'self' devas esti vortaro"
 
diff --git a/src/po/fr.po b/src/po/fr.po
index fa41abe3ef359e3b9d67638c48a0e1fa6d63e262..d602eb183734339b30a022f7bb90546156967cc5 100644
--- a/src/po/fr.po
+++ b/src/po/fr.po
@@ -6,7 +6,7 @@
 #  FIRST AUTHOR  DindinX         <David.Odin@bigfoot.com>     2000.
 # SECOND AUTHOR  Adrien Beau     <version.francaise@free.fr>  2002, 2003.
 #  THIRD AUTHOR  David Blanchet  <david.blanchet@free.fr>     2006, 2008.
-# FOURTH AUTHOR  Dominique Pellé <dominique.pelle@gmail.com>  2008, 2012.
+# FOURTH AUTHOR  Dominique Pellé <dominique.pelle@gmail.com>  2008, 2013.
 #
 # Latest translation available at:
 #   http://dominique.pelle.free.fr/vim-fr.php
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Français)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-19 06:35+0200\n"
-"PO-Revision-Date: 2012-08-19 06:48+0200\n"
+"POT-Creation-Date: 2013-02-10 14:05+0100\n"
+"PO-Revision-Date: 2013-02-10 14:48+0100\n"
 "Last-Translator: Dominique Pellé <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -1521,8 +1521,8 @@ msgid "unknown"
 msgstr "inconnu"
 
 #, c-format
-msgid "E185: Cannot find color scheme %s"
-msgstr "E185: Impossible de trouver le jeu de couleurs %s"
+msgid "E185: Cannot find color scheme '%s'"
+msgstr "E185: Impossible de trouver le jeu de couleurs '%s'"
 
 msgid "Greetings, Vim user!"
 msgstr "Bienvenue, utilisateur de Vim !"
@@ -2848,6 +2848,9 @@ msgstr "impossible d'ins
 msgid "string cannot contain newlines"
 msgstr "une chaîne ne peut pas contenir de saut-de-ligne"
 
+msgid "error converting Scheme values to Vim"
+msgstr "erreur lors de la conversion d'une valeur de Scheme à Vim"
+
 msgid "Vim error: ~a"
 msgstr "Erreur Vim : ~a"
 
@@ -2869,7 +2872,6 @@ msgstr "non autoris
 msgid "E836: This Vim cannot execute :python after using :py3"
 msgstr "E836: Vim ne peut pas exécuter :python après avoir utilisé :py3"
 
-#. Add conversion from PyInt?
 msgid "only string keys are allowed"
 msgstr "seule une chaine est autorisée comme clé"
 
@@ -2889,15 +2891,6 @@ msgstr "E858: Eval n'a pas retourn
 msgid "E859: Failed to convert returned python object to vim value"
 msgstr "E859: Conversion d'objet python à une valeur de vim a échoué"
 
-msgid "can't delete OutputObject attributes"
-msgstr "impossible d'effacer les attributs d'OutputObject"
-
-msgid "softspace must be an integer"
-msgstr "softspace doit être un nombre entier"
-
-msgid "invalid attribute"
-msgstr "attribut invalide"
-
 #, c-format
 msgid "<buffer object (deleted) at %p>"
 msgstr "<objet tampon (effacé) à %p>"
@@ -6833,6 +6826,15 @@ msgstr "La recherche a atteint le BAS, et continue en HAUT"
 msgid "Need encryption key for \"%s\""
 msgstr "Besoin de la clé de chiffrement pour \"%s\""
 
+msgid "can't delete OutputObject attributes"
+msgstr "impossible d'effacer les attributs d'OutputObject"
+
+msgid "softspace must be an integer"
+msgstr "softspace doit être un nombre entier"
+
+msgid "invalid attribute"
+msgstr "attribut invalide"
+
 msgid "writelines() requires list of strings"
 msgstr "writelines() requiert une liste de chaînes"
 
@@ -6842,15 +6844,30 @@ msgstr "E264: Python : Erreur d'initialisation des objets d'E/S"
 msgid "no such buffer"
 msgstr "ce tampon n'existe pas"
 
+msgid "empty keys are not allowed"
+msgstr "les clés vides ne sont pas autorisées"
+
 msgid "failed to add key to dictionary"
 msgstr "l'ajout de clé au dictionnaire a échoué"
 
-msgid "dict is locked"
-msgstr "dictionnaire est verrouillé"
+msgid "Cannot delete DictionaryObject attributes"
+msgstr "Impossible d'effacer les attributs de DictionaryObject"
+
+msgid "Cannot modify fixed dictionary"
+msgstr "Impossible de modifier un dictionnaire fixe"
+
+msgid "Only boolean objects are allowed"
+msgstr "Seuls les objets booléens sont autorisés"
+
+msgid "Cannot set this attribute"
+msgstr "Impossible d'initialiser cet attribut"
 
 msgid "no such key in dictionary"
 msgstr "cette clé est inexistante dans le dictionnaire"
 
+msgid "dict is locked"
+msgstr "dictionnaire est verrouillé"
+
 msgid "internal error: failed to get vim list item"
 msgstr "erreur interne : accès à un élément de liste a échoué"
 
@@ -6872,6 +6889,9 @@ msgstr "erreur interne : ajout d'
 msgid "can only concatenate with lists"
 msgstr "on ne peut que concaténer avec des listes"
 
+msgid "Cannot modify fixed list"
+msgstr "Impossible de modifier une liste fixe"
+
 msgid "'self' argument must be a dictionary"
 msgstr "l'argument 'self' doit être un dictionnaire"
 
diff --git a/src/testdir/test89.in b/src/testdir/test89.in
new file mode 100644
index 0000000000000000000000000000000000000000..d15d468a8ff0e090dbec6ad4a466df8c700829ea
--- /dev/null
+++ b/src/testdir/test89.in
@@ -0,0 +1,15 @@
+Some tests for setting 'number' and 'relativenumber'
+
+STARTTEST
+:set hidden nocp nu rnu
+:redir @a | set nu? rnu? | redir END
+:e! xx
+:redir @b | set nu? rnu? | redir END
+:e! #
+:$put ='results:'
+:$put a
+:$put b
+:/^results/,$w! test.out
+:q!
+ENDTEST
+
diff --git a/src/testdir/test89.ok b/src/testdir/test89.ok
new file mode 100644
index 0000000000000000000000000000000000000000..0f45471dc924899db7e8e15e58221733f96b8bb0
--- /dev/null
+++ b/src/testdir/test89.ok
@@ -0,0 +1,7 @@
+results:
+
+nonumber
+  relativenumber
+
+nonumber
+  relativenumber