diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index a9e8acf..0ed5cb3 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.3.  Last change: 2012 Jun 20
+*cmdline.txt*   For Vim version 7.3.  Last change: 2012 Oct 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -217,7 +217,7 @@
 			   :return cmd
 			:endfunc
 <		This doesn't work recursively, thus not when already editing
-		an expression.
+		an expression.  But it is possible to use in a mapping.
 
 							*c_CTRL-Y*
 CTRL-Y		When there is a modeless selection, copy the selection into
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 8934215..3afc3d0 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 7.3.  Last change: 2012 Sep 05
+*eval.txt*	For Vim version 7.3.  Last change: 2012 Oct 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -91,8 +91,8 @@
 Note that in the command >
 	:if "foo"
 "foo" is converted to 0, which means FALSE.  To test for a non-empty string,
-use strlen(): >
-	:if strlen("foo")
+use empty(): >
+	:if !empty("foo")
 <				*E745* *E728* *E703* *E729* *E730* *E731*
 List, Dictionary and Funcref types are not automatically converted.
 
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index 9a37b86..c2d9510 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 7.3.  Last change: 2012 Jun 06
+*mbyte.txt*     For Vim version 7.3.  Last change: 2012 Oct 06
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
@@ -1085,6 +1085,13 @@
 used for the start of another character.
 The "accents" keymap uses this.				*keymap-accents*
 
+The first column can also be in |<>| form:
+	<C-c>		Ctrl-C
+	<A-c>		Alt-c
+	<A-C>		Alt-C
+Note that the Alt mappings may not work, depending on your keyboard and
+terminal.
+
 Although it's possible to have more than one character in the second column,
 this is unusual.  But you can use various ways to specify the character: >
 	A	a		literal character
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f6bedda..53d4e8a 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 Aug 15
+*options.txt*	For Vim version 7.3.  Last change: 2012 Oct 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -756,7 +756,7 @@
 			feature}
 	When on and 'termbidi' is off, the required visual character
 	corrections that need to take place for displaying the Arabic language
-	take affect.  Shaping, in essence, gets enabled; the term is a broad
+	take effect.  Shaping, in essence, gets enabled; the term is a broad
 	one which encompasses:
 	  a) the changing/morphing of characters based on their location
 	     within a word (initial, medial, final and stand-alone).
@@ -6119,7 +6119,8 @@
 			local to buffer
 	Number of spaces to use for each step of (auto)indent.  Used for
 	|'cindent'|, |>>|, |<<|, etc.
-	When zero the 'ts' value will be used.
+	When zero the 'ts' value will be used.  Use the |shiftwidth()|
+	function to get the effective shiftwidth value.
 
 						*'shortmess'* *'shm'*
 'shortmess' 'shm'	string	(Vim default "filnxtToO", Vi default: "",
@@ -6383,6 +6384,7 @@
 	of 8, while being able to edit like it is set to 'sts'.  However,
 	commands like "x" still work on the actual characters.
 	When 'sts' is zero, this feature is off.
+	When 'sts' is negative, the value of 'shiftwidth' is used.
 	'softtabstop' is set to 0 when the 'paste' option is set.
 	See also |ins-expandtab|.  When 'expandtab' is not set, the number of
 	spaces is minimized by using <Tab>s.
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 0317e38..4d0c4d0 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -7550,6 +7550,7 @@
 shellescape()	eval.txt	/*shellescape()*
 shift	intro.txt	/*shift*
 shift-left-right	change.txt	/*shift-left-right*
+shiftwidth()	eval.txt	/*shiftwidth()*
 short-name-changed	version4.txt	/*short-name-changed*
 showing-menus	gui.txt	/*showing-menus*
 sign-commands	sign.txt	/*sign-commands*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index b0fa841..8567310 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 Oct 04
+*todo.txt*      For Vim version 7.3.  Last change: 2012 Oct 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,43 +34,27 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Patch with Test for patch  7.3.673 (Christian Brabandt, 2012 Oct 3)
-
-Patch for C-\ e when editing expression. (Christian Brabandt, 2012 Oct 3)
-Correction by ZyX.
-
 Go through more coverity reports.
 
 Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
 
 Checking runtime scripts: Thilo Six, 2012 Jun 6.
 
-Crash with 1023 byte directory name. (Danek Duvall, 2012 Sep 19)
-
-Patch for wrong text in balloon, Issue 58. (Dominique Pelle)
-
-Patch for menu.vim to correct message about adding spell file.
-(Jiri Sedlak, 2012 Sep 24)
-
 GTK: problem with 'L' in 'guioptions' changing the window width.
 (Aaron Cornelius, 2012 Feb 6)
 
-Patch for SGR mouse with older xterm. (Hayaki Saito, 2012 Sep 19)
+Patch to fix undofile hash computed when not necessary. (Christian Brabandt,
+2012 Oct 16, update Oct 18)
 
-Patch for crash with an autocommand. (ZyX, 2012 Sep 6, second one)
-Also patch for garbage, but use vim_strncpy() instead.
-
-Patch to fix crash on Win32 when setting 'encoding'. (Jiri Sedlak, 2012 Sep
-12)
-
-Patch to update example using empty(). (ZyX, 2012 Sep 13)
+Patch to fix repeating "cgn". (Christian Brabandt, 2012 Oct 16)
+Update Oct 17.
 
 Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
 
 Updated French and Esperanto files. (Dominique Pelle, 2012 Aug 19)
 
 When showing diffs filler lines may be hidden at first.
-Patch by Christian Brabandt, 2012 Sep 6.
+Patch by Christian Brabandt, 2012 Sep 6.  Update Oct 11.
 
 Patch for memory leaks on exception. (ZyX, 2012 Sep 9)
 
@@ -78,6 +62,11 @@
 - The word that was selected (empty if abandoned complete)
 - Type of completion: tag, omnifunc, user func.
 
+Unwanted file name escaping: ":echo input('file:' , '', 'file')"
+And use file name completion on a file with spaces. (Frederic Hardy, 2009 Mar
+23)
+Patch by Christian Brabandt, 2012 Oct 18.  Update Oct 19.
+
 mouse_sgr is not ordered alphabetically in :version output.
 Docs list mouse_urxvt as normal feature, should be big. (Hayaki Saito, 2012
 Aug 16)
@@ -104,7 +93,7 @@
 Stocker, 2012 Jan 5)
 
 Patch to support 'u' in interactive substitute. (Christian Brabandt, 2012 Sep
-28)  Asked for tests.
+28)  With tests: Oct 9.
 
 Patch for IME handling, adds 'imactivatefunc' and 'imstatusfunc' option.
 (Yukihiro Nakadaira, 2012 Aug 16)
@@ -115,10 +104,17 @@
 New syntax files for apt. (quidame, 2012 Sep 21)
 
 Patch for if_lua. (Luis Carvalho, 2012 Aug 26, update Aug 29, another Aug 30,
-then Sep 1)
+then Sep 1, reminder Oct 14)
 
 Issue 72: 'autochdir' causes problems for :vimgrep.
 
+:setlocal does not work in the sandbox, but :set does.  Both should work in a
+similar way (not setting some options). (Michael Henry, 2012 Oct 20)
+
+In the ATTENTION message about an existing swap file, mention the name of the
+process that is running.  It might actually be some other program, e.g. after
+a reboot.
+
 MS-Windows: Crash opening very long file name starting with "\\".
 (Christian Brock, 2012 Jun 29)
 
@@ -169,6 +165,10 @@
 Patch to support user name completion on MS-Windows. (Yasuhiro Matsumoto, 2012
 Aug 16)
 
+Have an option for spell checking to not mark any Chinese, Japanese or other
+double-width characters as error.  Or perhaps all characters above 256.
+(Bill Sun)  Helps a lot for mixed Asian and latin text.
+
 URXVT:
 - will get stuck if byte sequence does not containe expected semicolon.
 - Use urxvt mouse support also in xterm.  Explanations:
@@ -761,10 +761,6 @@
 'delcombine' does not work for the command line. (Tony Mechelynck, 2009 Jul
 20)
 
-Unwanted file name escaping: ":echo input('file:' , '', 'file')"
-And use file name completion on a file with spaces. (Frederic Hardy, 2009 Mar
-23)
-
 Don't load macmap.vim on startup, turn it into a plugin. (Ron Aaron,
 2009 Apr 7)  Reminder Apr 14.
 
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 1a4ae3d..edb9b82 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 7.3.  Last change: 2012 Mar 16
+*usr_41.txt*	For Vim version 7.3.  Last change: 2012 Oct 13
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -1581,7 +1581,7 @@
 
 RESTORING THE VIEW
 
-Sometimes you want to make a change and go back to where cursor was.
+Sometimes you want to make a change and go back to where the cursor was.
 Restoring the relative position would also be nice, so that the same line
 appears at the top of the window.
    This example yanks the current line, puts it above the first line in the