Updated runtime files.

166af9bb · Bram Moolenaar · 644d37b8 · 166af9bb · 166af9bb · 166af9bb
Commit 166af9bb authored 14 years ago by Bram Moolenaar
--- a/runtime/autoload/tohtml.vim
+++ b/runtime/autoload/tohtml.vim
--- a/runtime/doc/arabic.txt
+++ b/runtime/doc/arabic.txt
-*arabic.txt*	For Vim version 7.3.  Last change: 2005 Mar 29
+*arabic.txt*	For Vim version 7.3.  Last change: 2010 Nov 13
 		  VIM REFERENCE MANUAL	  by Nadim Shaikli
@@ -146,7 +146,7 @@ o  Enable Arabic settings [short-cut]
 		:set arabic
 <
   The two above noted possible invocations are the preferred manner
-   in which users are instructed to proceed.  Baring an enabled 'termbidi'
+   in which users are instructed to proceed.  Barring an enabled 'termbidi'
   setting, both command options:
     1. set the appropriate keymap

--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
-*diff.txt*      For Vim version 7.3.  Last change: 2010 Sep 30
+*diff.txt*      For Vim version 7.3.  Last change: 2010 Nov 03
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -373,8 +373,8 @@ get an error message.  Possible causes:
 If it's not clear what the problem is set the 'verbose' option to one or more
 to see more messages.
-The self-installing Vim includes a diff program.  If you don't have it you
+The self-installing Vim for MS-Windows includes a diff program.  If you don't
-might want to download a diff.exe.  For example from
+have it you might want to download a diff.exe.  For example from
 http://jlb.twu.net/code/unixkit.php.

--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
-*eval.txt*	For Vim version 7.3.  Last change: 2010 Oct 27
+*eval.txt*	For Vim version 7.3.  Last change: 2010 Nov 13
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -4017,7 +4017,7 @@ maparg({name}[, {mode} [, {abbr} [, {dict}]]])			*maparg()*
 			     characters will be used:
 			     " "     Normal, Visual and Operator-pending
 			     "!"     Insert and Commandline mode
-				     (|mapmpde-ic|)
+				     (|mapmode-ic|)
 		  "sid"	     The script local ID, used for <sid> mappings
 			     (|<SID>|).

--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
-*gui.txt*       For Vim version 7.3.  Last change: 2010 May 14
+*gui.txt*       For Vim version 7.3.  Last change: 2010 Nov 03
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -156,26 +156,26 @@ configure which ones appear with the 'guioptions' option.
 The interface looks like this (with ":set guioptions=mlrb"):
-		       +------------------------------+
+		       +------------------------------+ `
-		       | File  Edit		 Help | <- Menu bar (m)
+		       | File  Edit		 Help | <- Menu bar (m) `
-		       +-+--------------------------+-+
+		       +-+--------------------------+-+ `
-		       |^|			    |^|
+		       |^|			    |^| `
-		       |#| Text area.		    |#|
+		       |#| Text area.		    |#| `
-		       | |			    | |
+		       | |			    | | `
-		       |v|__________________________|v|
+		       |v|__________________________|v| `
- Normal status line -> |-+ File.c	       5,2  +-|
+ Normal status line -> |-+ File.c	       5,2  +-| `
- between Vim windows   |^|""""""""""""""""""""""""""|^|
+ between Vim windows   |^|""""""""""""""""""""""""""|^| `
-		       | |			    | |
+		       | |			    | | `
-		       | | Another file buffer.     | |
+		       | | Another file buffer.     | | `
-		       | |			    | |
+		       | |			    | | `
-		       |#|			    |#|
+		       |#|			    |#| `
- Left scrollbar (l) -> |#|			    |#| <- Right
+ Left scrollbar (l) -> |#|			    |#| <- Right `
-		       |#|			    |#|    scrollbar (r)
+		       |#|			    |#|    scrollbar (r) `
-		       | |			    | |
+		       | |			    | | `
-		       |v|			    |v|
+		       |v|			    |v| `
-		       +-+--------------------------+-+
+		       +-+--------------------------+-+ `
-		       | |< ####		   >| | <- Bottom
+		       | |< ####		   >| | <- Bottom `
-		       +-+--------------------------+-+    scrollbar (b)
+		       +-+--------------------------+-+    scrollbar (b) `
 Any of the scrollbar or menu components may be turned off by not putting the
 appropriate letter in the 'guioptions' string.  The bottom scrollbar is

--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
-*insert.txt*    For Vim version 7.3.  Last change: 2010 Oct 27
+*insert.txt*    For Vim version 7.3.  Last change: 2010 Nov 10
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1037,6 +1037,8 @@ items:
 			items that only differ in case are added
 	dup		when non-zero this match will be added even when an
 			item with the same word is already present.
+	empty		when non-zero this match will be added even when it is
+			an empty string
 All of these except 'icase' must be a string.  If an item does not meet these
 requirements then an error message is given and further items in the list are
@@ -1064,9 +1066,9 @@ match to the total list.  These matches should then not appear in the returned
 list!  Call |complete_check()| now and then to allow the user to press a key
 while still searching for matches.  Stop searching when it returns non-zero.
-The function is allowed to move the cursor, it is restored afterwards.  This
+							*E839* *E840*
-option cannot be set from a |modeline| or in the |sandbox|, for security
+The function is allowed to move the cursor, it is restored afterwards.
-reasons.
+The function is not allowed to move to another window or delete text.
 An example that completes the names of the months: >
 	fun! CompleteMonths(findstart, base)

--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
-*intro.txt*     For Vim version 7.3.  Last change: 2010 Sep 29
+*intro.txt*     For Vim version 7.3.  Last change: 2010 Nov 03
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -703,7 +703,7 @@ Lines longer than the window width will wrap, unless the 'wrap' option is off
 (see below).  The 'linebreak' option can be set to wrap at a blank character.
 If the window has room after the last line of the buffer, Vim will show '~' in
-the first column of the last lines in the window, like this: >
+the first column of the last lines in the window, like this:
 	+-----------------------+
 	|some line		|
@@ -715,7 +715,7 @@ the first column of the last lines in the window, like this: >
 Thus the '~' lines indicate that the end of the buffer was reached.
 If the last line in a window doesn't fit, Vim will indicate this with a '@' in
-the first column of the last lines in the window, like this: >
+the first column of the last lines in the window, like this:
 	+-----------------------+
 	|first line		|

--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
-*map.txt*       For Vim version 7.3.  Last change: 2010 Sep 29
+*map.txt*       For Vim version 7.3.  Last change: 2010 Nov 10
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1093,16 +1093,20 @@ is executed, it is transformed into a normal Ex command and then executed.
 For starters: See section |40.2| in the user manual.
-						*E183* *user-cmd-ambiguous*
+					*E183* *E841* *user-cmd-ambiguous*
 All user defined commands must start with an uppercase letter, to avoid
-confusion with builtin commands.  (There are a few builtin commands, notably
+confusion with builtin commands.  Exceptions are these builtin commands:
-:Next, :Print and :X, which do start with an uppercase letter.  The builtin
+	:Next
-will always take precedence in these cases).  The other characters of the user
+	:X
-command can be uppercase letters, lowercase letters or digits.  When using
+They cannot be used for a user defined command.  ":Print" is also an existing
-digits, note that other commands that take a numeric argument may become
+command, but it is deprecated and can be overruled.
-ambiguous.  For example, the command ":Cc2" could be the user command ":Cc2"
-without an argument, or the command ":Cc" with argument "2".  It is advised to
+The other characters of the user command can be uppercase letters, lowercase
-put a space between the command name and the argument to avoid these problems.
+letters or digits.  When using digits, note that other commands that take a
+numeric argument may become ambiguous.  For example, the command ":Cc2" could
+be the user command ":Cc2" without an argument, or the command ":Cc" with
+argument "2".  It is advised to put a space between the command name and the
+argument to avoid these problems.
 When using a user-defined command, the command can be abbreviated.  However, if
 an abbreviation is not unique, an error will be issued.  Furthermore, a

--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
-*options.txt*	For Vim version 7.3.  Last change: 2010 Oct 23
+*options.txt*	For Vim version 7.3.  Last change: 2010 Nov 16
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1699,7 +1699,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	with CTRL-X CTRL-U. |i_CTRL-X_CTRL-U|
 	See |complete-functions| for an explanation of how the function is
 	invoked and what it should return.
+	This option cannot be set from a |modeline| or in the |sandbox|, for
+	security reasons.
 						*'completeopt'* *'cot'*
 'completeopt' 'cot'	string	(default: "menu,preview")
@@ -2843,6 +2844,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	      "dos" is not present or no <CR><NL> is found in the file.
 	     Except: if "unix" was chosen, but there is a <CR> before
 	     the first <NL>, and there appear to be more <CR>s than <NL>s in
+	     the first few lines, "mac" is used.
 	  4. If 'fileformat' is still not set, the first name from
 	     'fileformats' is used.
 	  When reading a file into an existing buffer, the same is done, but
@@ -6230,8 +6232,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Do smart autoindenting when starting a new line.  Works for C-like
 	programs, but can also be used for other languages.  'cindent' does
 	something like this, works better in most cases, but is more strict,
-	see |C-indenting|.  When 'cindent' is on, setting 'si' has no effect.
+	see |C-indenting|.  When 'cindent' is on or 'smartindent' is set,
-	'indentexpr' is a more advanced alternative.
+	setting 'si' has no effect.  'indentexpr' is a more advanced
+	alternative.
 	Normally 'autoindent' should also be on when using 'smartindent'.
 	An indent is automatically inserted:
 	- After a line ending in '{'.
@@ -7533,8 +7536,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		with an uppercase letter, and don't contain a lowercase
 		letter.  Thus "KEEPTHIS and "K_L_M" are stored, but "KeepThis"
 		and "_K_L_M" are not.  Nested List and Dict items may not be
-		read back correctly, you end up with a string representation
+		read back correctly, you end up with an empty item.
-		instead.
 	"	Maximum number of lines saved for each register.  Old name of
 		the '<' item, with the disadvantage that you need to put a
 		backslash before the ", otherwise it will be recognized as the

--- a/runtime/doc/pi_tar.txt
+++ b/runtime/doc/pi_tar.txt
-*pi_tar.txt*	For Vim version 7.3.  Last change: 2010 Aug 09
+*pi_tar.txt*	For Vim version 7.3.  Last change: 2010 Nov 03
 		       +====================+
 		       | Tar File Interface |
@@ -60,11 +60,11 @@ Copyright 2005-2010: The GPL (gnu public license) applies to	*tar-copyright*
   <.vimrc> file.
                         Default
   Variable               Value   Explanation
-   *g:tar_browseoptions*  "Ptf"   used to get a list of contents
+   *g:tar_browseoptions*    "Ptf"   used to get a list of contents
-   *g:tar_readoptions*    "OPxf"  used to extract a file from a tarball
+   *g:tar_readoptions*      "OPxf"  used to extract a file from a tarball
-   *g:tar_cmd*            "tar"   the name of the tar program
+   *g:tar_cmd*              "tar"   the name of the tar program
-   *g:tar_nomax*            0     if true, file window will not be maximized
+   *g:tar_nomax*              0     if true, file window will not be maximized
-   *g:tar_secure*         undef   if exists:
+   *g:tar_secure*           undef   if exists:
 					"--"s will be used to prevent unwanted
 					option expansion in tar commands.
 					Please be sure that your tar command
@@ -76,7 +76,7 @@ Copyright 2005-2010: The GPL (gnu public license) applies to	*tar-copyright*
 					"-"
 				  Not all tar's support the "--" which is why
 				  it isn't default.
-   *g:tar_writeoptions*   "uf"    used to update/replace a file
+   *g:tar_writeoptions*     "uf"    used to update/replace a file
 ==============================================================================

--- a/runtime/doc/quotes.txt
+++ b/runtime/doc/quotes.txt
-*quotes.txt*    For Vim version 7.3.  Last change: 2006 Apr 24
+*quotes.txt*    For Vim version 7.3.  Last change: 2010 Nov 03
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -260,15 +260,16 @@ Eccettuato, Italy)
 In summary:
-     __     ___		    _	    _	_  ___ _____
+     __     ___		    _	    _	_  ___ _____ `
-     \ \   / (_)_ __ ___   (_)___  | | | |/ _ \_   _|
+     \ \   / (_)_ __ ___   (_)___  | | | |/ _ \_   _| `
-      \ \ / /| | '_ ` _ \  | / __| | |_| | | | || |
+      \ \ / /| | '_ ` _ \  | / __| | |_| | | | || | `
-       \ V / | | | | | | | | \__ \ |  _  | |_| || |
+       \ V / | | | | | | | | \__ \ |  _  | |_| || | `
-	\_/  |_|_| |_| |_| |_|___/ |_| |_|\___/ |_|
+	\_/  |_|_| |_| |_| |_|___/ |_| |_|\___/ |_| `
-	     ____ _____ _   _ _____ _____ _ _
+	     ____ _____ _   _ _____ _____ _ _ `
-	    / ___|_   _| | | |	___|  ___| | |
+	    / ___|_   _| | | |	___|  ___| | | `
-	    \___ \ | | | | | | |_  | |_  | | |
+	    \___ \ | | | | | | |_  | |_  | | | `
-	     ___) || | | |_| |	_| |  _| |_|_|
+	     ___) || | | |_| |	_| |  _| |_|_| `
-	    |____/ |_|	\___/|_|   |_|	 (_|_)	      (Tony Nugent, Australia)
+	    |____/ |_|	\___/|_|   |_|	 (_|_)	    (Tony Nugent, Australia) `
 vim:tw=78:ts=8:ft=help:norl:
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
-*syntax.txt*	For Vim version 7.3.  Last change: 2010 Sep 23
+*syntax.txt*	For Vim version 7.3.  Last change: 2010 Oct 7
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -390,10 +390,10 @@ Or use the ":TOhtml" user command.  It is defined in a standard plugin.
 	:10,40TOhtml
-Warning: This is slow! The script must process every character of every line.
+Warning: This can be slow! The script must process every character of every
-Because it is so slow, by default a progress bar is displayed in the
+line. Because it can take a long time, by default a progress bar is displayed
-statusline for each step that usually takes a long time. If you don't like
+in the statusline for each major step in the conversion process. If you don't
-seeing this progress bar, you can disable it and get a very minor speed
+like seeing this progress bar, you can disable it and get a very minor speed
 improvement with: >
 	let g:html_no_progress = 1
@@ -475,40 +475,69 @@ risk of making some things look a bit different, use: >
 This will use <br> at the end of each line and use "&nbsp;" for repeated
 spaces.
-The current value of 'encoding' is used to specify the charset of the HTML
+For diff mode on a single file (with g:html_diff_one_file) a sequence of more
-file.  This only works for those values of 'encoding' that have an equivalent
+than 3 filler lines is displayed as three lines with the middle line
-HTML charset name.  To overrule this set g:html_use_encoding to the name of
+mentioning the total number of inserted lines.  If you prefer to see all the
-the charset to be used: >
+inserted lines as with the side-by-side diff, use: >
-   :let g:html_use_encoding = "foobar"
+    :let g:html_whole_filler = 1
-To omit the line that specifies the charset, set g:html_use_encoding to an
+And to go back to displaying up to three lines again: >
-empty string: >
+    :unlet g:html_whole_filler
+<
+TOhtml uses the current value of 'fileencoding' if set, or 'encoding' if not,
+to determine the charset and 'fileencoding' of the HTML file. In general, this
+works for the encodings mentioned specifically by name in |encoding-names|, but
+TOhtml will only automatically use those encodings which are widely supported.
+However, you can override this to support specific encodings that may not be
+automatically detected by default.
+To overrule all automatic charset detection, set g:html_use_encoding to the
+name of the charset to be used. TOhtml will try to determine the appropriate
+'fileencoding' setting from the charset, but you may need to set it manually
+if TOhtml cannot determine the encoding. It is recommended to set this
+variable to something widely supported, like UTF-8, for anything you will be
+hosting on a webserver: >
+   :let g:html_use_encoding = "UTF-8"
+You can also use this option to omit the line that specifies the charset
+entirely, by setting g:html_use_encoding to an empty string: >
   :let g:html_use_encoding = ""
 To go back to the automatic mechanism, delete the g:html_use_encoding
 variable: >
   :unlet g:html_use_encoding
+If you specify a charset with g:html_use_encoding for which TOhtml cannot
+automatically detect the corresponding 'fileencoding' setting, you can use
+g:html_encoding_override to allow TOhtml to detect the correct encoding.
+This is a dictionary of charset-encoding pairs that will replace existing
+pairs automatically detected by TOhtml, or supplement with new pairs. For
+example, to allow TOhtml to detect the HTML charset "windows-1252" properly as
+the encoding "8bit-cp1252", use: >
+   :let g:html_encoding_override = {'windows-1252': '8bit-cp1252'}
 <
-For diff mode a sequence of more than 3 filler lines is displayed as three
+The g:html_charset_override is similar, it allows TOhtml to detect the HTML
-lines with the middle line mentioning the total number of inserted lines.  If
+charset for any 'fileencoding' or 'encoding' which is not detected
-you prefer to see all the inserted lines use: >
+automatically. You can also use it to override specific existing
-    :let g:html_whole_filler = 1
+encoding-charset pairs. For example, TOhtml will by default use UTF-8 for all
-And to go back to displaying up to three lines again: >
+Unicode/UCS encodings. To use UTF-16 and UTF-32 instead, use: >
-    :unlet g:html_whole_filler
+   :let g:html_charset_override = {'ucs-4': 'UTF-32', 'utf-16': 'UTF-16'}
-<
+Note that documents encoded in either UTF-32 or UTF-16 have known
+compatibility problems with at least one major browser.
 					    *convert-to-XML* *convert-to-XHTML*
-An alternative is to have the script generate XHTML (XML compliant HTML).  To
+If you do not like plain HTML, an alternative is to have the script generate
-do this set the "html_use_xhtml" variable: >
+XHTML (XML compliant HTML). To do this set the "html_use_xhtml" variable: >
    :let g:html_use_xhtml = 1
-Any of these options can be enabled or disabled by setting them explicitly to
+Any of the on/off options listed above can be enabled or disabled by setting
-the desired value, or restored to their default by removing the variable using
+them explicitly to the desired value, or restored to their default by removing
-|:unlet|.
+the variable using |:unlet|.
 Remarks:
- This only works in a version with GUI support.  If the GUI is not actually
-  running (possible for X11) it still works, but not very well (the colors
-  may be wrong).
 - Some truly ancient browsers may not show the background colors.
 - From most browsers you can also print the file (in color)!
+- This version of TOhtml may work with older versions of Vim, but some
+  features such as conceal support will not function, and the colors may be
+  incorrect for an old Vim without GUI support compiled in.
 Here is an example how to run the script over all .c and .h files from a
 Unix shell: >

--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4216,7 +4216,9 @@ E835	options.txt	/*E835*
 E836	if_pyth.txt	/*E836*
 E837	if_pyth.txt	/*E837*
 E838	netbeans.txt	/*E838*
+E839	insert.txt	/*E839*
 E84	windows.txt	/*E84*
+E840	insert.txt	/*E840*
 E85	options.txt	/*E85*
 E86	windows.txt	/*E86*
 E87	windows.txt	/*E87*

--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
-*todo.txt*      For Vim version 7.3.  Last change: 2010 Oct 27
+*todo.txt*      For Vim version 7.3.  Last change: 2010 Nov 16
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,7 +30,11 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
-Segfault with command line abbreviation. (Randy Morris, 2010 Oct 25)
+Crash when using vimgrep with an ftp file. (Christian Brabandt, 2010 Nov 5)
+Crash with dragn-n-drop of file combined with netrw (Marius Gedminas, 2008 Jun
+11)  I can't reproduce it.  It's probably caused by a handle_drop() call
+in combination with autocommands that invoke a ":redraw" command.
+Another valgrind output Jun 30.
 'cursorline' is displayed too short when there are concealed characters and
 'list' is set, 'listchars' at default value. (Dennis Preiser, 2010 Aug 15)
@@ -38,6 +42,10 @@ Segfault with command line abbreviation. (Randy Morris, 2010 Oct 25)
 Conceal: using Tab for cchar causes problems.  Should reject it. (ZyX, 2010
 Aug 25)
+Problems with building after 7.3.050, -as-needed does not work for gcc 4.4.1?
+(Charles Campbell, 2010 Nov 7)  Or is the problem that we should use -ltinfo,
+because nothing is used from ncurses?
 Syntax region with 'concealends' and a 'cchar' value, 'conceallevel' set to 2,
 only one of the two ends gets the cchar displayed. (Brett Stahlman, 2010 Aug
 21, Ben Fritz, 2010 Sep 14)
@@ -56,53 +64,42 @@ Using ":break" or something else that stops executing commands inside a
 ":finally" does not rethrow a previously uncaught exception. (ZyX, 2010 Oct
 15)
-Patch for 2html to support 'fileencoding'. (Benjamin Fritz, 2010 Sep 10)
-Beta testing finished now?
-Three patches for undo persistence. (Christian Brabandt, 2010 Sep 4)
-Patch to adjust mzscheme to support racket. (Sergey Khorev, 2010 Oct 24)
 string() can't parse back "inf" and "nan".  Fix documentation or fix code?
 (ZyX, 2010 Aug 23)
-Patch to use "--as-needed" instead of the link.sh functionality.  (Kirill A.
-Shutemov, 2010 Aug 25)
-ml_get error for using :copen in a custom complete function. (Xavier
-Deguillard, 2010 Oct 19)  Other way to reproduce it by Lech Lorens, Oct 20.
-Patch from Lech: Oct 20. More problems from Lech, Oct 21.
-Patch to fix complete(). (Kikuchan, 2010 Oct 15)
 maparg() does not show the <script> flag.  How to restore the script ID?
-Ruby: Patch to load Gem module.  Why is this needed? (Yasuhiro Matsumoto, 2010
+Patch to fix \%V item in regexp. (Christian Brabandt, 2010 Nov 8)
-Oct 6)
+Not quite right.
-":command Print echo 'print'" works, but ":Print" doesn't.  Builtin Print
-should be overruled. (Aaron Thoma)
-Patch by Christian Brabandt, 2010 Sep 5.
-Comparing recursive structure loops forever. (ZyX, 2010 Aug 22, info from John
-Beckett Aug 23)
-Patch from Christian Brabandt, 2010 Oct 2
-":drop" does not respect 'autochdir'. (Peter Odding, 2010 Jul 24)
-Patch from Benjamin Fritz, 2010 Oct 13.
 Highlighting stops working after changing it many times.  Script to reproduce
 it: Pablo Contreras, 2010 Oct 12  Windows XP and 7.  Font is never freed?
+When 'cursorcolumn' is set locally to a window, ":new" opens a window with the
+same highlighting but 'cursorcolumn' is empty. (Tyru, 2010 Nov 15)
 GTK: drawing a double-width combining character over single-width characters
 doesn't look right. (Dominique Pelle, 2010 Aug 8)
+GTK: patch to fix hitting Enter in a dialog. (Britton Kerin, 2010 Nov 11)
 GTK: tear-off menu does not work. (Kurt Sonnenmoser, 2010 Oct 25)
+":find" completion does not escape space in directory name. (Isz, 2010 Nov 2)
+Win32: When using Chinese tear-off menu doesn't work. (Weasley, 2010 Oct 31)
+Patch by Alex Jakushev, 2010 Nov 2.
+Using control characters in 'statusline' doesn't work well. (ZyX, 2010 Nov 1)
+Patch by Caio Ariede, 2010 Nov 3
 Using ":call" inside "if 0" does not see that a function returns a Dict and
 gives error for "." as string concatenation.  (Yasuhiro Matsumoto, 2010 Oct 20)
 Patch: Oct 20.
+Patch to move check for emsg_not_now() up to avoid statusline not being
+updated. (James Vega, 2010 Nov 4)
 Copy/paste between Vim and Google chrome doesn't work well for multi-byte
 characters. (Ben Haskell, 2010 Sep 17)
 When putting text in the cut buffer (when exiting) and conversion doesn't work
@@ -121,8 +118,9 @@ the system encoding (usually utf-8).
 Problem producing tags file when hebrew.frx is present.  It has a BOM.
 Results in E670. (Tony Mechelynck, 2010 May 2)
-Patch for dynamic loading Ruby on Unix. (Jon, 2010 Aug 23)
+Patch to support sorting on floating point number.
-Included, but also need a change to configure.
+Ruby: ":ruby print $buffer.number" returns zero.
 setpos() does not restore cursor position after :normal. (Tyru, 2010 Aug 11)
@@ -138,6 +136,9 @@ and that it's documented.
 With "tw=55 fo+=a" typing space before ) doesn't work well. (Scott Mcdermott,
 2010 Oct 24)
+Patch to add random number generator. (Hong Xu, 2010 Nov 8, update Nov 10)
+Alternative from Christian Brabandt. (2010 Sep 19)
 Messages in message.txt are highlighted as examples.
 When using cp850 the NBSP (0xff) is not drawn correctly. (Brett Stahlman, 2010
@@ -166,17 +167,33 @@ Echo starts in the wrong column:
    while 1 | let s = input('A') | echo 'R' | endw
 (Boyko Bantchev, 2010 Aug 9)
+Patch for GVimExt to show an icon. (Dominik Riebeling, 2010 Nov 7)
 Patch: Let rare word highlighting overrule good word highlighting.
 (Jakson A. Aquino, 2010 Jul 30)
 Patch to make more characters work in dialogs. (Yankwei Jia, 2010 Aug 4)
+Patch for VisVim, pass file name to VimOpenFile. (Jiri Sedlak, 2010 Nov 12)
 When 'lines' is 25 and 'scrolloff' is 12, "j" scrolls zero or two lines
 instead of one. (Constantin Pan, 2010 Sep 10)
+Writing nested List and Dict in viminfo gives error message and can't be read
+back. (Yukihiro Nakadaira, 2010 Nov 13)
+Dos uninstal may delete vim.bat from the wrong directory (e.g., when someone
+makes his own wrapper).  Add a magic string with the version number to the
+.bat file and check for it in the uninstaller.  E.g.
+          # uninstall key: vim7.3*
 Problem with cursor in the wrong column. (SungHyun Nam, 2010 Mar 11)
 Additional info by Dominique Pelle. (also on 2010 Apr 10)
+CreateFile and CreateFileW are used without sharing, filewritable() fails when
+the file was already open (e.g. script is being sourced).  Add FILE_SHARE_READ|
+FILE_SHARE_WRITE in mch_access()? (Phillippe Vaucher, 2010 Nov 2)
 Is ~/bin (literally) in $PATH supposed to work?  (Paul, 2010 March 29)
 Looks like only bash can do it. (Yakov Lerner)
@@ -217,6 +234,9 @@ like it has ":keepjumps" before it.
 Coverity: ask someone to create new user: Dominique.
 Check if there are new reported defects: http://scan.coverity.com/rung2.html
+Patch to support :undo absolute jump to file save number. (Christian Brabandt,
+2010 Nov 5)
 When setting 'undofile' while the file is already loaded, but unchanged, try
 to read the undo file.  Requires computing a checksum of the text. (Andy
 Wokula)
@@ -266,6 +286,9 @@ Invalid read error in Farsi mode. (Dominique Pelle, 2009 Aug 2)
 For running gvim on an USB stick: avoid the OLE registration.  Use a command
 line argument -noregister.
+When using an expression in 'statusline' leading white space sometimes goes
+missing (but not always). (ZyX, 2010 Nov 1)
 When a mapping exists both for insert mode and lang-insert mode, the last one
 doesn't work. (Tyru, 2010 May 6)  Or is this intended?
@@ -437,6 +460,11 @@ correct.  Don't use it in the swap file.
 Completion for ":buf" doesn't work properly on Win32 when 'shellslash' is off.
 (Henrik Ohman, 2009, Jan 29)
+shellescape() depends on 'shellshash' for quoting.  That doesn't work when
+'shellslash' is set but using cmd.exe. (Ben Fritz)
+Use a different option or let it depend on whether 'shell' looks like a
+unix-like shell?
 Allow patches to add something to version.c, like with an official patch, so
 that :version output shows which patches have been applied.
@@ -486,11 +514,6 @@ Having "Syntax" in 'eventignore' for :bufdo may cause problems, e.g. for
 option only for when jumping to another buffer, not when the command argument
 is executed.
-Crash with dragn-n-drop of file combined with netrw (Marius Gedminas, 2008 Jun
-11)  I can't reproduce it.  It's probably caused by a handle_drop() call
-in combination with autocommands that invoke a ":redraw" command.
-Another valgrind output Jun 30.
 ":pedit %" with a BufReadPre autocommand causes the cursor to move to the
 first line. (Ingo Karkat, 2008 Jul 1)  Ian Kelling is working on this.
@@ -903,6 +926,8 @@ if_ruby.c.
 Patch to dynamically load Python on Solaris. (Danek Duvall, 2009 Feb 16)
 Needs more work.
+Python3 interface doesn't handle utf-8 correctly? (Nov 2010, lilydjwg)
 The need_fileinfo flag is messy.  Instead make the message right away and put
 it in keep_msg?
@@ -1564,6 +1589,8 @@ Athena and Motif:
 Athena GUI:
+9   The first event for any button in the menu or toolbar appears to get lost.
+    The second click on a menu does work.
 9   When dragging the scrollbar thumb very fast, focus is only obtained in
    the scrollbar itself.  And the thumb is no longer updated when moving
    through files.
@@ -4379,6 +4406,8 @@ Debug mode:
 Various improvements:
+9   Python: be able to define a Python function that can be called directly
+    from Vim script.  Requires converting the arguments and return value.
 8   ":sign unplace * file={filename}" should work.  Also: ":sign unplace *
    buffer={bufnr}".  So one can remove all signs for one file/buffer.
 7   Add plugins for formatting?  Should be able to make a choice depending on

--- a/runtime/doc/usr_01.txt
+++ b/runtime/doc/usr_01.txt
-*usr_01.txt*	For Vim version 7.3.  Last change: 2008 May 07
+*usr_01.txt*	For Vim version 7.3.  Last change: 2010 Nov 03
 		     VIM USER MANUAL - by Bram Moolenaar
@@ -40,13 +40,20 @@ the commands and options used for it.  Use these two commands:
 	Press  CTRL-]  to jump to a subject under the cursor.
 	Press  CTRL-O  to jump back (repeat to go further back).
-Many links are in vertical bars, like this: |bars|.  An option name, like
+Many links are in vertical bars, like this: |bars|.  The bars themselves may
-'number', a command in double quotes like ":write" and any other word can also
+be hidden or invisible, see below.  An option name, like 'number', a command
-be used as a link.  Try it out: Move the cursor to  CTRL-]  and press CTRL-]
+in double quotes like ":write" and any other word can also be used as a link.
-on it.
+Try it out: Move the cursor to  CTRL-]  and press CTRL-] on it.
 Other subjects can be found with the ":help" command, see |help.txt|.
+The bars and stars are usually hidden with the |conceal| feature.  They also
+use |hl-Ignore|, using the same color for the text as the background.  You can
+make them visible with: >
+	:set conceallevel=0
+	:hi link HelpBar Normal
+	:hi link HelpStar Normal
 ==============================================================================
 *01.2*	Vim installed

--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
-*usr_41.txt*	For Vim version 7.3.  Last change: 2010 Jul 20
+*usr_41.txt*	For Vim version 7.3.  Last change: 2010 Oct 31
 		     VIM USER MANUAL - by Bram Moolenaar
@@ -793,6 +793,7 @@ Syntax and highlighting:	  *syntax-functions* *highlighting-functions*
 	synID()			get syntax ID at a specific position
 	synIDattr()		get a specific attribute of a syntax ID
 	synIDtrans()		get translated syntax ID
+	synstack()		get list of syntax IDs at a specific position
 	diff_hlID()		get highlight ID for diff mode at a position
 	matchadd()		define a pattern to highlight (a "match")
 	matcharg()		get info about |:match| arguments

--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
-*various.txt*   For Vim version 7.3.  Last change: 2010 Sep 23
+*various.txt*   For Vim version 7.3.  Last change: 2010 Nov 10
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -101,6 +101,7 @@ g8			Print the hex values of the bytes used in the
 :[range]P[rint] [count] [flags]
 			Just as ":print".  Was apparently added to Vi for
 			people that keep the shift key pressed too long...
+			Note: A user command can overrule this command.
 			See |ex-flags| for [flags].
 							*:l* *:list*

--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
-*version7.txt*  For Vim version 7.3.  Last change: 2010 Oct 20
+*version7.txt*  For Vim version 7.3.  Last change: 2010 Nov 03
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1673,7 +1673,7 @@ The GTK font dialog uses a font size zero when the font name doesn't include a
 size.  Use a default size of 10.
 This example in the documentation didn't work:
-    :e `=foo . ".c" `
+    :e `=foo . ".c"`
 Skip over the expression in `=expr` when looking for comments, |, % and #.
 When ":helpgrep" doesn't find anything there is no error message.

--- a/runtime/doc/vim2html.pl
+++ b/runtime/doc/vim2html.pl
@@ -214,7 +214,7 @@ EOF
 }
 # main
-usage() if $#ARGV < 2;
+usage() if $#ARGV < 1;
 print "Processing tags...\n";
 readTagFile( $ARGV[ 0 ] );

--- a/runtime/plugin/tohtml.vim
+++ b/runtime/plugin/tohtml.vim
 " Vim plugin for converting a syntax highlighted file to HTML.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2010 Aug 12
+" Last Change: 2010 Oct 28
 "
 " The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and
 " $VIMRUNTIME/syntax/2html.vim
 "
 " TODO:
+"   * Patch to leave tab characters in when noexpandtab set (Andy Spencer)
+"   * Make folds show up when using a range and dynamic folding
+"   * Remove fold column when there are no folds and using dynamic folding
 "   * Restore open/closed folds and cursor position after processing each file
 "     with option not to restore for speed increase
 "   * Add extra meta info (generation time, etc.)
-"   * Tidy up so we can use strict doctype more?
+"   * Tidy up so we can use strict doctype in even more situations?
 "   * Implementation detail: add threshold for writing the lines to the html
 "     buffer before we're done (5000 or so lines should do it)
 "   * TODO comments for code cleanup scattered throughout
+"
+"
+" Changelog:
+"   7.3_v7 (this version): see betas released on vim_dev below:
+"                7.3_v7b3: Fixed bug, convert Unicode to UTF-8 all the way.
+"                7.3_v7b2: Remove automatic detection of encodings that are not
+"                          supported by all major browsers according to
+"                          http://wiki.whatwg.org/wiki/Web_Encodings and convert
+"                          to UTF-8 for all Unicode encodings. Make HTML
+"                          encoding to Vim encoding detection be
+"                          case-insensitive for built-in pairs.
+"                7.3_v7b1: Remove use of setwinvar() function which cannot be
+"                          called in restricted mode (Andy Spencer). Use
+"                          'fencoding' instead of 'encoding' to determine by
+"                          charset, and make sure the 'fenc' of the generated
+"                          file matches its indicated charset. Add charsets for
+"                          all of Vim's natively supported encodings.
+"   7.3_v6 (0d3f0e3d289b): Really fix bug with 'nowrapscan', 'magic' and other
+"                          user settings interfering with diff mode generation,
+"                          trailing whitespace (e.g. line number column) when
+"                          using html_no_pre, and bugs when using
+"                          html_hover_unfold.
+"   7.3_v5 ( unreleased ): Fix bug with 'nowrapscan' and also with out-of-sync
+"                          folds in diff mode when first line was folded.
+"   7.3_v4 (7e008c174cc3): Bugfixes, especially for xhtml markup, and diff mode.
+"   7.3_v3 (a29075150aee): Refactor option handling and make html_use_css
+"                          default to true when not set to anything. Use strict
+"                          doctypes where possible. Rename use_xhtml option to
+"                          html_use_xhtml for consistency. Use .xhtml extension
+"                          when using this option. Add meta tag for settings.
+"   7.3_v2 (80229a724a11): Fix syntax highlighting in diff mode to use both the
+"                          diff colors and the normal syntax colors
+"   7.3_v1 (e7751177126b): Add conceal support and meta tags in output
+"   Pre-v1 baseline: Mercurial changeset 3c9324c0800e
 if exists('g:loaded_2html_plugin')
  finish
 endif
-let g:loaded_2html_plugin = 'vim7.3_v6'
+let g:loaded_2html_plugin = 'vim7.3_v7'
 " Define the :TOhtml command when:
 " - 'compatible' is not set