Merge remote branch 'vim/master' into kaoriya

Conflicts:
	.hgtags

Author: splhack

.hgtags

@@ -1512,6 +1512,27 @@ ee48b3da9d53a487f3636df34cace6400d13f32c v7-3-172
 537e0102c0f9cc2c0656c298ed1534ef30176eb8 v7-3-175
 94f42ae4e4e66483fb6cc7305c61820b004c6182 v7-3-176
 66f2d62271fe77d4acdda5808bd0d3a45be3149c v7-3-177
+ac639ca9f58f7c71551c19090473395d81a021b6 v7-3-178
+11e62fb6f8154537f92be5f278c31e737247f781 v7-3-179
+ed47d18b39c6a672ad4f0caa2f2c3ee897e784a7 v7-3-180
+5381eb5b1eb9c39797c435ad904bfcb71f1efb01 v7-3-181
+21346361ce6c7e9afca2e475ceb62f6244197919 v7-3-182
+e4403440e192d082af7dc8fe3e1a12d24f0e259c v7-3-183
+b941cc96926a26b62d59f759a021ddb5b51823ed v7-3-184
+9c8dffc62a41a143230f76376f9a3abf46ff3536 v7-3-185
+3d1a3aa0240c7a9acdf3feb77b664798e3703463 v7-3-186
+8bd38abda3149cce7043da86e6093dbebecf63df v7-3-187
+f2e1c3a90a3bda6ce8977187b365745efd4e5c35 v7-3-188
+71e1da07e1414740d1d0eed47a346cb3292a9e2e v7-3-189
+30b7cde2194064040cb7d7e6485a5712b2fc9b40 v7-3-190
+107b03fdf1ad831e2697c22a04bd3eeaca08c291 v7-3-191
+8470ac4679c17b69aefb06989c6e8a267761988a v7-3-192
+e1c5f69de95b99112fae28c23ce6427ca251e50f v7-3-193
+664c1adcb909aca654c4fe9200364cc741068803 v7-3-194
+8dbea5adc937ecddf8ca336856cd487e1b118b1a v7-3-195
+d641f141f9376b3ecf2146e5d68c38bf0227c970 v7-3-196
+45c536fe48db330c4ee8f1056befe702d9d19cfe v7-3-197
+b0190e93e601f9061a797689a1eb95a86805f769 v7-3-198
 1aa9c79ff847cd945974dd6dec5172795ba6ad7a kaoriya-charspace
 fb2739bfd7c786b788ef7bcd988b61071d2ebd82 kaoriya-transparency
 c6ee0daceb5d8ed4c5d6f9c1d29a82c1d37a62f3 kaoriya-migemo

Filelist

@@ -427,20 +427,13 @@ SRC_EXTRA =	\
 		$(SRC_VMS) \
 		README_os390.txt \
 		src/Make_mint.mak \
-		src/Make_ro.mak \
-		src/gui_riscos.c \
-		src/gui_riscos.h \
 		src/if_sniff.c \
 		src/infplist.xml \
 		src/link.390 \
 		src/os_beos.c \
 		src/os_beos.h \
 		src/os_beos.rsrc \
 		src/os_mint.h \
-		src/os_riscos.c \
-		src/os_riscos.h \
-		src/proto/gui_riscos.pro \
-		src/proto/os_riscos.pro \
 		src/os_vms_fix.com \
 		src/toolbar.phi \
 

README_extra.txt

@@ -13,9 +13,6 @@ src/if_sniff.*		Interface to SNiFF.  If you don't know what SNiFF is,
 
 src/os_amiga.*		Files for the Amiga port.
 
-src/gui_riscos.*
-src/os_riscos.*		Files for the RISC OS port.
-
 src/gui_beos.*
 src/os_beos.*		Files for the BeOS port.
 

runtime/doc/autocmd.txt

@@ -299,6 +299,8 @@ Name			triggered by ~
 |InsertEnter|		starting Insert mode
 |InsertChange|		when typing <Insert> while in Insert or Replace mode
 |InsertLeave|		when leaving Insert mode
+|InsertCharPre|		when a character was typed in Insert mode, before
+			inserting it
 
 |ColorScheme|		after loading a color scheme
 
@@ -657,6 +659,17 @@ InsertChange			When typing <Insert> while in Insert or
 				indicates the new mode.
 				Be careful not to move the cursor or do
 				anything else that the user does not expect.
+							*InsertCharPre*
+InsertCharPre			When a character is typed in Insert mode,
+				before inserting the char.
+				The |v:char| variable indicates the char typed
+				and can be changed during the event to insert
+				a different character.  When |v:char| is set
+				to more than one character this text is
+				inserted literally.
+				It is not allowed to change the text |textlock|.
+				The event is not triggered when 'paste' is
+				set.
 							*InsertEnter*
 InsertEnter			Just before starting Insert mode.  Also for
 				Replace mode and Virtual Replace mode.  The

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.3.  Last change: 2011 Feb 25
+*change.txt*    For Vim version 7.3.  Last change: 2011 May 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -522,11 +522,11 @@ comment (starting with '"') after the ":!" command.
 ={motion}		Filter {motion} lines through the external program
 			given with the 'equalprg' option.  When the 'equalprg'
 			option is empty (this is the default), use the
-			internal formatting function |C-indenting|.  But when
-			'indentexpr' is not empty, it will be used instead
-			|indent-expression|.  When Vim was compiled without
-			internal formatting then the "indent" program is used
-			as a last resort.
+			internal formatting function |C-indenting| and
+			|'lisp'|.  But when 'indentexpr' is not empty, it will
+			be used instead |indent-expression|.  When Vim was
+			compiled without internal formatting then the "indent"
+			program is used as a last resort.
 
 							*==*
 ==			Filter [count] lines like with ={motion}.
@@ -919,8 +919,8 @@ inside of strings can change!  Also see 'softtabstop' option. >
 
 							*:y* *:yank* *E850*
 :[range]y[ank] [x]	Yank [range] lines [into register x]. Yanking to the
-			"* or "+ registers is possible only in GUI versions or
-			when the |+xterm_clipboard| feature is included.
+			"* or "+ registers is possible only when the
+			|+clipboard| feature is included.
 
 :[range]y[ank] [x] {count}
 			Yank {count} lines, starting with last line number
@@ -1390,16 +1390,19 @@ before typing anything else on the new line.  This will replace the
 middle-comment leader with the end-comment leader and apply any specified
 alignment, leaving just " */".  There is no need to hit BackSpace first.
 
+When there is a match with a middle part, but there also is a maching end part
+which is longer, the end part is used.  This makes a C style comment work
+without requiring the middle part to end with a space.
 
 Here is an example of alignment flags at work to make a comment stand out
-(kind of looks like a 1 too). Consider comment string >
-	sr:/***,m:**,ex2:******/
-
-                                   /***
-                                     **<--right aligned from "r" flag
-                                     **
-offset 2 spaces from the "2" flag--->**
-                                   ******/
+(kind of looks like a 1 too). Consider comment string: >
+	:set comments=sr:/***,m:**,ex-2:******/
+<
+                                   /*** ~
+                                     **<--right aligned from "r" flag ~
+                                     ** ~
+offset 2 spaces for the "-2" flag--->** ~
+                                   ******/ ~
 In this case, the first comment was typed, then return was pressed 4 times,
 then "/" was pressed to end the comment.
 
@@ -1417,8 +1420,8 @@ Reindenting using a different method like |gq| or |=| will not consult
 alignment flags either. The same behaviour can be defined in those other
 formatting options. One consideration is that 'cindent' has additional options
 for context based indenting of comments but cannot replicate many three piece
-indent alignments.  However, 'indentexpr' is has the ability to work better
-with three piece comments.
+indent alignments.  However, 'indentexpr' has the ability to work better with
+three piece comments.
 
 Other examples: >
    "b:*"	Includes lines starting with "*", but not if the "*" is

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 7.3.  Last change: 2011 Mar 18
+*eval.txt*	For Vim version 7.3.  Last change: 2011 May 17
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1293,6 +1293,7 @@ v:beval_winnr	The number of the window, over which the mouse pointer is. Only
 					*v:char* *char-variable*
 v:char		Argument for evaluating 'formatexpr' and used for the typed
 		character when using <expr> in an abbreviation |:map-<expr>|.
+		It is also used by the |InsertPreChar| event.
 
 			*v:charconvert_from* *charconvert_from-variable*
 v:charconvert_from
@@ -1545,7 +1546,9 @@ v:progname	Contains the name (with path removed) with which Vim was
 
 					*v:register* *register-variable*
 v:register	The name of the register in effect for the current normal mode
-		command.  If none is supplied it is the default register.
+		command.  If none is supplied it is the default register '"',
+		unless 'clipboard' contains "unnamed" or "unnamedplus", then
+		it is '*' or '+'.
 		Also see |getreg()| and |setreg()|
 
 					*v:scrollstart* *scrollstart-variable*
@@ -4074,6 +4077,7 @@ match({expr}, {pat}[, {start}[, {count}]])			*match()*
 		{pat} matches.
 		A match at the first character or |List| item returns zero.
 		If there is no match -1 is returned.
+		For getting submatches see |matchlist()|.
 		Example: >
 			:echo match("testing", "ing")	" results in 4
 			:echo match([1, 'x'], '\a')	" results in 1
@@ -5579,6 +5583,10 @@ substitute({expr}, {pat}, {sub}, {flags})		*substitute()*
 <		This removes the last component of the 'path' option. >
 			:echo substitute("testing", ".*", "\\U\\0", "")
 <		results in "TESTING".
+		The {sub} argument can start with \=, just like with
+		|:substitute|.  Example: >
+			:echo substitute(s, '%\(\x\x\)',
+			   \ '\=nr2char("0x" . submatch(1))', 'g')
 
 synID({lnum}, {col}, {trans})				*synID()*
 		The result is a Number, which is the syntax ID at the position
@@ -6222,7 +6230,8 @@ persistent_undo		Compiled with support for persistent undo history.
 postscript		Compiled with PostScript file printing.
 printer			Compiled with |:hardcopy| support.
 profile			Compiled with |:profile| support.
-python			Compiled with Python interface.
+python			Compiled with Python 2.x interface. |has-python|
+python3			Compiled with Python 3.x interface. |has-python|
 qnx			QNX version of Vim.
 quickfix		Compiled with |quickfix| support.
 reltime			Compiled with |reltime()| support.

runtime/doc/fold.txt

@@ -60,7 +60,7 @@ level form a fold, with the lines with a higher level forming a nested fold.
 The nesting of folds is limited with 'foldnestmax'.
 
 Some lines are ignored and get the fold level of the line above or below it,
-whatever is the lowest.  These are empty or white lines and lines starting
+whichever is lower.  These are empty or white lines and lines starting
 with a character in 'foldignore'.  White space is skipped before checking for
 characters in 'foldignore'.  For C use "#" to ignore preprocessor lines.
 

runtime/doc/if_pyth.txt

@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 7.3.  Last change: 2010 Oct 20
+*if_pyth.txt*   For Vim version 7.3.  Last change: 2011 May 07
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -377,6 +377,18 @@ To work around such problems there are these options:
 3. You undefine PY_NO_RTLD_GLOBAL in auto/config.h after configuration.  This
    may crash Vim though.
 
+							*has-python*
+You can test what Python version is available with: >
+	if has('python')
+	  echo 'there is Pyton 2.x'
+  	elseif has('python3')
+	  echo 'there is Python 3.x'
+	endif
+
+Note however, that when Python 2 and 3 are both available and loaded
+dynamically, these has() calls will try to load them.  If only one can be
+loaded at a time, just checking if Python 2 or 3 are available will prevent
+the other one from being available.
 
 ==============================================================================
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/intro.txt

@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 7.3.  Last change: 2010 Dec 08
+*intro.txt*     For Vim version 7.3.  Last change: 2011 May 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -135,8 +135,10 @@ http://www.vim.org/maillist.php
 
 Bug reports:				*bugs* *bug-reports* *bugreport.vim*
 
-Send bug reports to: Vim bugs <[email protected]>
-This is not a maillist but the message is redirected to the Vim maintainer.
+Send bug reports to: Vim Developers <[email protected]>
+This is a maillist, many people will see the message.  If you don't want that,
+e.g. because it is a security issue, send it to <[email protected]>, this only goes
+to the Vim maintainer (that's Bram).
 Please be brief; all the time that is spent on answering mail is subtracted
 from the time that is spent on improving Vim!  Always give a reproducible
 example and try to find out which settings or other things influence the

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.3.  Last change: 2011 Apr 13
+*map.txt*       For Vim version 7.3.  Last change: 2011 May 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -226,7 +226,7 @@ text before the cursor and start omni completion when some condition is met.
 
 For abbreviations |v:char| is set to the character that was typed to trigger
 the abbreviation.  You can use this to decide how to expand the {lhs}.  You
-can't change v:char and you should not insert it.
+you should not either insert or change the v:char.
 
 Be very careful about side effects!  The expression is evaluated while
 obtaining characters, you may very well make the command dysfunctional.
@@ -480,9 +480,9 @@ You can create an empty {rhs} by typing nothing after a single CTRL-V (you
 have to type CTRL-V two times).  Unfortunately, you cannot do this in a vimrc
 file.
 							*<Nop>*
-A easier way to get a mapping that doesn't produce anything, is to use "<Nop>"
-for the {rhs}.  This only works when the |<>| notation is enabled.  For
-example, to make sure that function key 8 does nothing at all: >
+An easier way to get a mapping that doesn't produce anything, is to use
+"<Nop>" for the {rhs}.  This only works when the |<>| notation is enabled.
+For example, to make sure that function key 8 does nothing at all: >
 	:map  <F8>  <Nop>
 	:map! <F8>  <Nop>
 <
@@ -495,7 +495,7 @@ scenario: >
 	:set encoding=utf-8
 The mapping for <M-C> is defined with the latin1 encoding, resulting in a 0xc3
 byte.  If you type the character á (0xe1 <M-a>) in UTF-8 encoding this is the
-two bytes 0xc3 0xa1.  You don't want the 0xc3 byte to be mapped then,
+two bytes 0xc3 0xa1.  You don't want the 0xc3 byte to be mapped then or
 otherwise it would be impossible to type the á character.
 
 					*<Leader>* *mapleader*
@@ -1177,13 +1177,15 @@ reported if any are supplied).  However, it is possible to specify that the
 command can take arguments, using the -nargs attribute.  Valid cases are:
 
 	-nargs=0    No arguments are allowed (the default)
-	-nargs=1    Exactly one argument is required
-	-nargs=*    Any number of arguments are allowed (0, 1, or many)
+	-nargs=1    Exactly one argument is require, it includes spaces 
+	-nargs=*    Any number of arguments are allowed (0, 1, or many),
+		    separated by white space
 	-nargs=?    0 or 1 arguments are allowed
 	-nargs=+    Arguments must be supplied, but any number are allowed
 
 Arguments are considered to be separated by (unescaped) spaces or tabs in this
-context.
+context, except when there is one argument, then the white space is part of
+the argument.
 
 Note that arguments are used as text, not as expressions.  Specifically,
 "s:var" will use the script-local variable in the script where the command was