Merge branch 'master' into split-browser

Conflicts:
	src/MacVim/English.lproj/Preferences.nib/designable.nib
	src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib

.hgtags

@@ -1595,3 +1595,65 @@ c296c225736e4489706c62c95752a0c4788be1d3 v7-3-256
 bdc3335bd72eea207b28fcf8af90a73c855c8847 v7-3-258
 59130cd78dfc73bd04f22d201b8f7c0772d98e79 v7-3-259
 cb4682b959098e486977eb4b5969c9eb07d2798e v7-3-260
+410d42e3d4da09284394456186143d595e9b2efc v7-3-261
+847733973bfdd716bfafc364a4102e76f88e7fe8 v7-3-262
+a56259157c935b4e78e9f5f4dfb1436e3461eefb v7-3-263
+aa40bddeea9a44c6c6b4ffa32c1ef373df437a16 v7-3-264
+eff686fb8de66a26367f5e6430d34729f1a0e336 v7-3-265
+25be7c9dda549e4cfa1eb57937dc2b38b3d1e997 v7-3-266
+ad404f2a4bfa5374e97f29335f41b7ef34cd6bfa v7-3-267
+ee17ee712512451a54046d6bcd3ddb9f70cb5cdf v7-3-268
+7f4f5ca70dbde4e31c2de494b982bfb9bd71ed75 v7-3-269
+b9182da84c7eeda221e5219ef4361cca201b3b41 v7-3-270
+32a52f06f33b9e2d4817330099b410c1fcf64db2 v7-3-271
+02f5abca10aee570d5a9cf00928ffaa663daba66 v7-3-272
+7d4e5e31d8c10c767cdf774a2b13aedd2f95f096 v7-3-273
+1bb6776fa8c445e0b3f9dd2ed14fdf2a56f5873e v7-3-274
+125c7bf52271461dfbf46cc33317eadc67aaf742 v7-3-275
+37a54a85413eae68932233e64a0ab88c99c9d811 v7-3-276
+e5b17a5f651696ad4c523a21822692115d371250 v7-3-277
+6622f28b7e87a93de6f1520945d1c5d2a1fc0dab v7-3-278
+342b176089678e86cde3e1afac4aaaa1e5153f99 v7-3-279
+58bba69b3371d9ff02b27fe24f044e229c8aa99a v7-3-280
+45ead8a0bedeade57c320d72e9f710a703e61cf0 v7-3-281
+92167bb91c95410a0550ff8c94370307bb7d9d80 v7-3-282
+47b6d37b60122f45eb147106b8da1322c1cdbc60 v7-3-283
+27d43855b72312500e6fc2122e167a579a1f35f2 v7-3-284
+6018c815e1205e7db9328fe6ed91b26b514465f3 v7-3-285
+3f822e54765c54a1112a953e3c37bb60185fd51c v7-3-286
+07bc2ccfe5559035e785f22851365b3a31dec67e v7-3-287
+e4f3fa1a474e677dce486ea07ee31270f92b2b4a v7-3-288
+44ffd0a8abcdba441216514cb711649eb1169876 v7-3-289
+df33dba4e553f8fa27ba467042f16315c613a00d v7-3-290
+e8ee4b4ebf41abb199ea9a9e9cc38f9b0c2f7192 v7-3-291
+b6af1c5dd22f08db2b9e52ae763f193ba82965ad v7-3-292
+6cd0d6413a2e03687aca8138b2843f1f2aac5b84 v7-3-293
+dbd73fe939cf772a8b07c19230e5ee60aa0cfcc7 v7-3-294
+0d8494c051131b6470fe8af67646e235bc63fcf7 v7-3-295
+c19c15a9e9bf2914b25748c0544936e84a5c77c0 v7-3-296
+22550986c713ce5f37f069f0c8f99a54dc4a421b v7-3-297
+43b1d031e3028248abcbd5099841d3aafda7f68d v7-3-298
+eb4972982bfea006ead5b461f319744d5ecd58f5 v7-3-299
+2665b456ee59652c7b590dff0fa522ce337e0f16 v7-3-300
+4a70971530899e32058207cae683a69e7b8f85dc v7-3-301
+61b2f26623104f75850b1568bf61663597fe7fb0 v7-3-302
+d832d642f520d426f111b35102450617922547d3 v7-3-303
+b3a523ced6bd1173e4c17611559c173094830d43 v7-3-304
+0e06c025f66ffdfea20c8b73a995d23448b8dbfb v7-3-305
+0787bb5f387b79842d5c9353ae3541a992d1b9f1 v7-3-306
+880b7dd69331d1fefaf2d8735b118b39d546280c v7-3-307
+61c5e1527bd857e724f8396c89d0687126390675 v7-3-308
+6eae1b42c6684f3fcdb4d6cdbfb7dc1942d9b364 v7-3-309
+51ce22ba89d11505e18aa585fbd7dcbb22097f9a v7-3-310
+2cbde6bcc6238f41506f87bf31ff7d90f632345a v7-3-311
+0ed06069aaf32dbb2aa3827b23280b0028954ce7 v7-3-312
+dc60200a16b21c3e4157708bb825ea61b9e5bdc1 v7-3-313
+6ab1b45cc95ed56105b2130dc9938bb8344ff903 v7-3-314
+3ecf9e91d88acdb5eaaf93cc15a18914b60e0eb3 v7-3-315
+33c140e4664d102c34ec3ec5a17318f75cf475d7 v7-3-316
+92a181a1cec3fec52cde1b3d71f628a3a2dc53c6 v7-3-317
+d68f20a86a3ec75d927955be5d31983b6c37eb1d v7-3-318
+dc7f2f9759208aa07bf136deca661fd080a1ee68 v7-3-319
+738ea87c196431c452bd499c5a9849597ac938de v7-3-320
+fc0804089b2945bfe683f9bc9ee0238b8c64a46e v7-3-321
+38a7fd9043474dfb464c338ffd7f393361f5a6c1 v7-3-322

README_mac.txt

@@ -12,7 +12,8 @@ install in (usually `/Applications').
 How to build and install
 ========================
 
-Run `./configure` in the `src/` directory with the flags you want, e.g.:
+Run `./configure` in the `src/` directory with the flags you want (call
+`./configure --help` to see a list of flags) e.g.:
 
     $ cd src
     $ ./configure --with-features=huge \

runtime/doc/autocmd.txt

@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.3.  Last change: 2011 May 19
+*autocmd.txt*   For Vim version 7.3.  Last change: 2011 Aug 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -448,6 +448,9 @@ BufWriteCmd			Before writing the whole buffer to a file.
 				'modified' if successful, unless '+' is in
 				'cpo' and writing to another file |cpo-+|.
 				The buffer contents should not be changed.
+				When the command resets 'modified' the undo
+				information is adjusted to mark older undo
+				states as 'modified', like |:write| does.
 				|Cmd-event|
 							*BufWritePost*
 BufWritePost			After writing the whole buffer to a file
@@ -508,6 +511,7 @@ CursorMoved			After the cursor was moved in Normal mode.
 				not expect or that is slow.
 							*CursorMovedI*
 CursorMovedI			After the cursor was moved in Insert mode.
+				Not triggered when the popup menu is visible.
 				Otherwise the same as CursorMoved.
 							*EncodingChanged*
 EncodingChanged			Fires off after the 'encoding' option has been

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 7.3.  Last change: 2011 Jul 13
+*eval.txt*	For Vim version 7.3.  Last change: 2011 Aug 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -39,7 +39,7 @@ done, the features in this document are not available.	See |+eval| and
 							*E712*
 There are six types of variables:
 
-Number		A 32 bit signed number.  |expr-number| *Number*
+Number		A 32 or 64 bit signed number.  |expr-number| *Number*
 		Examples:  -123  0x10  0177
 
 Float		A floating point number. |floating-point-format| *Float*

runtime/doc/gui.txt

@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 7.3.  Last change: 2010 Nov 03
+*gui.txt*       For Vim version 7.3.  Last change: 2011 Jul 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -147,6 +147,15 @@ task bar with the 'guiheadroom' option.
 If you are running the X Window System, you can get information about the
 window Vim is running in with this command: >
 	:!xwininfo -id $WINDOWID
+<
+							*gui-IME* *iBus*
+Input methods for international characters in X that rely on the XIM
+framework, most notably iBus, have been known to produce undesirable results
+in gVim. These may include an inability to enter spaces, or long delays
+between typing a character and it being recognized by the application.
+
+One workaround that has been successful, for unknown reasons, is to prevent
+gvim from forking into the background by starting it with the |-f| argument.
 
 ==============================================================================
 2. Scrollbars						*gui-scrollbars*

runtime/doc/gui_w32.txt

@@ -1,4 +1,4 @@
-*gui_w32.txt*   For Vim version 7.3.  Last change: 2010 Dec 19
+*gui_w32.txt*   For Vim version 7.3.  Last change: 2011 Jul 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -137,6 +137,9 @@ options:
 And if there already is a gvim running:
 "Edit with existing gvim"   -- edit the file with the running gvim
 
+The "edit with existing Vim" entries can be disabled by adding an entry in the
+registry under HKLM\Software\Vim\Gvim, named DisableEditWithExisting, and with
+any value.
 						*install-registry*
 You can add the "Edit with Vim" menu entry in an easy way by using the
 "install.exe" program.  It will add several registry entries for you.

runtime/doc/gui_x11.txt

@@ -1,4 +1,4 @@
-*gui_x11.txt*   For Vim version 7.3.  Last change: 2010 Jul 20
+*gui_x11.txt*   For Vim version 7.3.  Last change: 2011 Sep 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -61,6 +61,8 @@ launches the gui but doesn't fork (see |mvim|). However, doing |:gui| in an
 already running vim will never fork in MacVim.
 
 "gvim --nofork" does the same as "gvim -f".
+								*E851* *E852*
+When starting the GUI fails Vim will try to continue running in the terminal.
 
 If you want the GUI to run in the foreground always, include the 'f'
 flag in 'guioptions'.  |-f|.  MacVim does not support this flag in

runtime/doc/if_pyth.txt

@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 7.3.  Last change: 2011 May 07
+*if_pyth.txt*   For Vim version 7.3.  Last change: 2011 Aug 19
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -380,7 +380,7 @@ To work around such problems there are these options:
 							*has-python*
 You can test what Python version is available with: >
 	if has('python')
-	  echo 'there is Pyton 2.x'
+	  echo 'there is Python 2.x'
   	elseif has('python3')
 	  echo 'there is Python 3.x'
 	endif

runtime/doc/indent.txt

@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 7.3.  Last change: 2011 Jul 15
+*indent.txt*    For Vim version 7.3.  Last change: 2011 Sep 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -132,8 +132,8 @@ The 'cinoptions' option sets how Vim performs indentation.  The value after
 the option character can be one of these (N is any number):
 	N	indent N spaces
 	-N	indent N spaces to the left
-	Ns	N times 'shiftwidth spaces
-	-Ns	N times 'shiftwidth spaces to the left
+	Ns	N times 'shiftwidth' spaces
+	-Ns	N times 'shiftwidth' spaces to the left
 
 In the list below,
 "N" represents a number of your choice (the number can be negative).  When
@@ -432,7 +432,7 @@ The examples below assume a 'shiftwidth' of 4.
 		       c3			    c3
 		      ) && c4;			) && c4;
 <
-							*cino-2*
+							*cino-w*
 	wN    When in unclosed parentheses and N is non-zero and either
 	      using "(0" or "u0", respectively, or using "U0" and the unclosed
 	      parentheses is the first non-white character in its line, line
@@ -706,6 +706,43 @@ Indent for a continuation line: >
 	let g:pyindent_continue = '&sw * 2'
 
 
+R								*ft-r-indent*
+
+Function arguments are aligned if they span for multiple lines. If you prefer
+do not have the arguments of functions aligned, put in your |vimrc|:
+>
+   let r_indent_align_args = 0
+<
+All lines beginning with a comment character, #, get the same indentation
+level of the normal R code. Users of Emacs/ESS may be used to have lines
+beginning with a single # indented in the 40th column, ## indented as R code,
+and ### not indented. If you prefer that lines beginning with comment
+characters are aligned as they are by Emacs/ESS, put in your |vimrc|:
+>
+   let r_indent_ess_comments = 1
+<
+If you prefer that lines beginning with a single # are aligned at a column
+different from the 40th one, you should set a new value to the variable
+r_indent_comment_column, as in the example below:
+>
+   let r_indent_comment_column = 30
+<
+Any code after a line that ends with "<-" is indented. Emacs/ESS does not
+indent the code if it is a top level function. If you prefer that the
+Vim-R-plugin behaves like Emacs/ESS in this regard, put in your |vimrc|:
+>
+   let r_indent_ess_compatible = 1
+<
+Below is an example of indentation with and without this option enabled:
+>
+   ### r_indent_ess_compatible = 1           ### r_indent_ess_compatible = 0
+   foo <-                                    foo <-
+       function(x)                               function(x)
+   {                                             {
+       paste(x)                                      paste(x)
+   }                                             }
+<
+
 SHELL							*ft-sh-indent*
 
 The amount of indent applied under various circumstances in a shell file can

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.3.  Last change: 2011 Jan 04
+*index.txt*     For Vim version 7.3.  Last change: 2011 Aug 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1261,7 +1261,7 @@ tag	      command	      action ~
 |:k|		:k		set a mark
 |:keepalt|	:keepa[lt]	following command keeps the alternate file
 |:keepmarks|	:kee[pmarks]	following command keeps marks where they are
-|:keepjumps|	:keepj[jumps]	following command keeps jumplist and marks
+|:keepjumps|	:keepj[umps]	following command keeps jumplist and marks
 |:lNext|	:lN[ext]	go to previous entry in location list
 |:lNfile|	:lNf[ile]	go to last entry in previous file
 |:list|		:l[ist]		print lines

runtime/doc/insert.txt

@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.3.  Last change: 2010 Nov 10
+*insert.txt*    For Vim version 7.3.  Last change: 2011 Sep 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1020,6 +1020,21 @@ On the second invocation the arguments are:
 The function must return a List with the matching words.  These matches
 usually include the "a:base" text.  When there are no matches return an empty
 List.
+
+In order to return more information than the matching words, return a Dict
+that contains the List.  The Dict can have these items:
+	words		The List of matching words (mandatory).
+	refresh		A string to control re-invocation of the function
+			(optional).
+			The only value currently recognized is "always", the
+			effect is that the function is called whenever the
+			leading text is changed.
+Other items are ignored.
+
+For example, the function can contain this: >
+	let matches = ... list of words ...
+	return {'words': matches, 'refresh': 'always'}
+<
 						*complete-items*
 Each list item can either be a string or a Dictionary.  When it is a string it
 is used as the completion.  When it is a Dictionary it can contain these
@@ -1040,9 +1055,10 @@ items:
 	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
-not used.  You can mix string and Dictionary items in the returned list.
+All of these except 'icase', 'dup' and 'empty' 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 not used.  You can mix string and Dictionary items in
+the returned list.
 
 The "menu" item is used in the popup menu and may be truncated, thus it should
 be relatively short.  The "info" item can be longer, it will  be displayed in

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.3.  Last change: 2011 Jun 13
+*map.txt*       For Vim version 7.3.  Last change: 2011 Aug 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -228,7 +228,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
-you should not either insert or change the v:char.
+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.
@@ -544,6 +544,7 @@ construct can be used:
 	<Char-123>	character 123
 	<Char-033>	character 27
 	<Char-0x7f>	character 127
+	<S-Char-114>    character 114 ('r') shifted ('R')
 This is useful to specify a (multi-byte) character in a 'keymap' file.
 Upper and lowercase differences are ignored.
 

runtime/doc/motion.txt

@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.3.  Last change: 2011 Jun 02
+*motion.txt*    For Vim version 7.3.  Last change: 2011 Jul 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1017,8 +1017,6 @@ CTRL-O			Go to [count] Older cursor position in jump list
 <Tab>		or					*CTRL-I* *<Tab>*
 CTRL-I			Go to [count] newer cursor position in jump list
 			(not a motion command).
-			In a |quickfix-window| it takes you to the position of
-			the error under the cursor.
 			{not in Vi}
 			{not available without the |+jumplist| feature}
 

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.3.  Last change: 2011 Jul 07
+*options.txt*	For Vim version 7.3.  Last change: 2011 Sep 09
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -4976,6 +4976,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   written.  A ":set nomodified" command also resets the original
 	   values to the current values and the 'modified' option will be
 	   reset.
+	This option is not set when a change is made to the buffer as the
+	result of a BufNewFile, BufRead/BufReadPost, BufWritePost,
+	FileAppendPost or VimLeave autocommand event.  See |gzip-example| for
+	an explanation.
 	When 'buftype' is "nowrite" or "nofile" this option may be set, but
 	will be ignored.
 
@@ -6013,8 +6017,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 	"bash.exe -c ls" or "command.com /c dir".  For the MS-DOS-like
 	systems, the default is set according to the value of 'shell', to
 	reduce the need to set this option by the user.  It's not used for
-	OS/2 (EMX figures this out itself).  See |option-backslash| about
-	including spaces and backslashes.  See |dos-shell|.
+	OS/2 (EMX figures this out itself).
+	On Unix it can have more than one flag.  Each white space separated
+	part is passed as an argument to the shell command.
+	See |option-backslash| about including spaces and backslashes.
+	Also see |dos-shell| for MS-DOS and MS-Windows.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.