Skip to content

Commit cd77757

Browse files
committed
Merge branch 'vim' of git://github.com/b4winckler/macvim into kaoriya
Conflicts: src/ex_getln.c
2 parents 35dae53 + 3323835 commit cd77757

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+2801
-1448
lines changed

.hgtags

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,3 +1601,58 @@ c296c225736e4489706c62c95752a0c4788be1d3 v7-3-256
16011601
bdc3335bd72eea207b28fcf8af90a73c855c8847 v7-3-258
16021602
59130cd78dfc73bd04f22d201b8f7c0772d98e79 v7-3-259
16031603
cb4682b959098e486977eb4b5969c9eb07d2798e v7-3-260
1604+
410d42e3d4da09284394456186143d595e9b2efc v7-3-261
1605+
847733973bfdd716bfafc364a4102e76f88e7fe8 v7-3-262
1606+
a56259157c935b4e78e9f5f4dfb1436e3461eefb v7-3-263
1607+
aa40bddeea9a44c6c6b4ffa32c1ef373df437a16 v7-3-264
1608+
eff686fb8de66a26367f5e6430d34729f1a0e336 v7-3-265
1609+
25be7c9dda549e4cfa1eb57937dc2b38b3d1e997 v7-3-266
1610+
ad404f2a4bfa5374e97f29335f41b7ef34cd6bfa v7-3-267
1611+
ee17ee712512451a54046d6bcd3ddb9f70cb5cdf v7-3-268
1612+
7f4f5ca70dbde4e31c2de494b982bfb9bd71ed75 v7-3-269
1613+
b9182da84c7eeda221e5219ef4361cca201b3b41 v7-3-270
1614+
32a52f06f33b9e2d4817330099b410c1fcf64db2 v7-3-271
1615+
02f5abca10aee570d5a9cf00928ffaa663daba66 v7-3-272
1616+
7d4e5e31d8c10c767cdf774a2b13aedd2f95f096 v7-3-273
1617+
1bb6776fa8c445e0b3f9dd2ed14fdf2a56f5873e v7-3-274
1618+
125c7bf52271461dfbf46cc33317eadc67aaf742 v7-3-275
1619+
37a54a85413eae68932233e64a0ab88c99c9d811 v7-3-276
1620+
e5b17a5f651696ad4c523a21822692115d371250 v7-3-277
1621+
6622f28b7e87a93de6f1520945d1c5d2a1fc0dab v7-3-278
1622+
342b176089678e86cde3e1afac4aaaa1e5153f99 v7-3-279
1623+
58bba69b3371d9ff02b27fe24f044e229c8aa99a v7-3-280
1624+
45ead8a0bedeade57c320d72e9f710a703e61cf0 v7-3-281
1625+
92167bb91c95410a0550ff8c94370307bb7d9d80 v7-3-282
1626+
47b6d37b60122f45eb147106b8da1322c1cdbc60 v7-3-283
1627+
27d43855b72312500e6fc2122e167a579a1f35f2 v7-3-284
1628+
6018c815e1205e7db9328fe6ed91b26b514465f3 v7-3-285
1629+
3f822e54765c54a1112a953e3c37bb60185fd51c v7-3-286
1630+
07bc2ccfe5559035e785f22851365b3a31dec67e v7-3-287
1631+
e4f3fa1a474e677dce486ea07ee31270f92b2b4a v7-3-288
1632+
44ffd0a8abcdba441216514cb711649eb1169876 v7-3-289
1633+
df33dba4e553f8fa27ba467042f16315c613a00d v7-3-290
1634+
e8ee4b4ebf41abb199ea9a9e9cc38f9b0c2f7192 v7-3-291
1635+
b6af1c5dd22f08db2b9e52ae763f193ba82965ad v7-3-292
1636+
6cd0d6413a2e03687aca8138b2843f1f2aac5b84 v7-3-293
1637+
dbd73fe939cf772a8b07c19230e5ee60aa0cfcc7 v7-3-294
1638+
0d8494c051131b6470fe8af67646e235bc63fcf7 v7-3-295
1639+
c19c15a9e9bf2914b25748c0544936e84a5c77c0 v7-3-296
1640+
22550986c713ce5f37f069f0c8f99a54dc4a421b v7-3-297
1641+
43b1d031e3028248abcbd5099841d3aafda7f68d v7-3-298
1642+
eb4972982bfea006ead5b461f319744d5ecd58f5 v7-3-299
1643+
2665b456ee59652c7b590dff0fa522ce337e0f16 v7-3-300
1644+
4a70971530899e32058207cae683a69e7b8f85dc v7-3-301
1645+
61b2f26623104f75850b1568bf61663597fe7fb0 v7-3-302
1646+
d832d642f520d426f111b35102450617922547d3 v7-3-303
1647+
b3a523ced6bd1173e4c17611559c173094830d43 v7-3-304
1648+
0e06c025f66ffdfea20c8b73a995d23448b8dbfb v7-3-305
1649+
0787bb5f387b79842d5c9353ae3541a992d1b9f1 v7-3-306
1650+
880b7dd69331d1fefaf2d8735b118b39d546280c v7-3-307
1651+
61c5e1527bd857e724f8396c89d0687126390675 v7-3-308
1652+
6eae1b42c6684f3fcdb4d6cdbfb7dc1942d9b364 v7-3-309
1653+
51ce22ba89d11505e18aa585fbd7dcbb22097f9a v7-3-310
1654+
2cbde6bcc6238f41506f87bf31ff7d90f632345a v7-3-311
1655+
0ed06069aaf32dbb2aa3827b23280b0028954ce7 v7-3-312
1656+
dc60200a16b21c3e4157708bb825ea61b9e5bdc1 v7-3-313
1657+
6ab1b45cc95ed56105b2130dc9938bb8344ff903 v7-3-314
1658+
3ecf9e91d88acdb5eaaf93cc15a18914b60e0eb3 v7-3-315

runtime/doc/autocmd.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*autocmd.txt* For Vim version 7.3. Last change: 2011 May 19
1+
*autocmd.txt* For Vim version 7.3. Last change: 2011 Aug 29
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -448,6 +448,9 @@ BufWriteCmd Before writing the whole buffer to a file.
448448
'modified' if successful, unless '+' is in
449449
'cpo' and writing to another file |cpo-+|.
450450
The buffer contents should not be changed.
451+
When the command resets 'modified' the undo
452+
information is adjusted to mark older undo
453+
states as 'modified', like |:write| does.
451454
|Cmd-event|
452455
*BufWritePost*
453456
BufWritePost After writing the whole buffer to a file
@@ -508,6 +511,7 @@ CursorMoved After the cursor was moved in Normal mode.
508511
not expect or that is slow.
509512
*CursorMovedI*
510513
CursorMovedI After the cursor was moved in Insert mode.
514+
Not triggered when the popup menu is visible.
511515
Otherwise the same as CursorMoved.
512516
*EncodingChanged*
513517
EncodingChanged Fires off after the 'encoding' option has been

runtime/doc/eval.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.3. Last change: 2011 Jul 13
1+
*eval.txt* For Vim version 7.3. Last change: 2011 Aug 29
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -39,7 +39,7 @@ done, the features in this document are not available. See |+eval| and
3939
*E712*
4040
There are six types of variables:
4141

42-
Number A 32 bit signed number. |expr-number| *Number*
42+
Number A 32 or 64 bit signed number. |expr-number| *Number*
4343
Examples: -123 0x10 0177
4444

4545
Float A floating point number. |floating-point-format| *Float*

runtime/doc/gui.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*gui.txt* For Vim version 7.3. Last change: 2010 Nov 03
1+
*gui.txt* For Vim version 7.3. Last change: 2011 Jul 22
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -147,6 +147,15 @@ task bar with the 'guiheadroom' option.
147147
If you are running the X Window System, you can get information about the
148148
window Vim is running in with this command: >
149149
:!xwininfo -id $WINDOWID
150+
<
151+
*gui-IME* *iBus*
152+
Input methods for international characters in X that rely on the XIM
153+
framework, most notably iBus, have been known to produce undesirable results
154+
in gVim. These may include an inability to enter spaces, or long delays
155+
between typing a character and it being recognized by the application.
156+
157+
One workaround that has been successful, for unknown reasons, is to prevent
158+
gvim from forking into the background by starting it with the |-f| argument.
150159

151160
==============================================================================
152161
2. Scrollbars *gui-scrollbars*

runtime/doc/gui_w32.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*gui_w32.txt* For Vim version 7.3. Last change: 2010 Dec 19
1+
*gui_w32.txt* For Vim version 7.3. Last change: 2011 Jul 23
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -137,6 +137,9 @@ options:
137137
And if there already is a gvim running:
138138
"Edit with existing gvim" -- edit the file with the running gvim
139139

140+
The "edit with existing Vim" entries can be disabled by adding an entry in the
141+
registry under HKLM\Software\Vim\Gvim, named DisableEditWithExisting, and with
142+
any value.
140143
*install-registry*
141144
You can add the "Edit with Vim" menu entry in an easy way by using the
142145
"install.exe" program. It will add several registry entries for you.

runtime/doc/gui_x11.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*gui_x11.txt* For Vim version 7.3. Last change: 2010 Jul 20
1+
*gui_x11.txt* For Vim version 7.3. Last change: 2011 Sep 14
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -53,6 +53,8 @@ When using "gvim -f" and then ":gui", Vim will run in the foreground. The
5353
":gui -b".
5454

5555
"gvim --nofork" does the same as "gvim -f".
56+
*E851* *E852*
57+
When starting the GUI fails Vim will try to continue running in the terminal.
5658

5759
If you want the GUI to run in the foreground always, include the 'f'
5860
flag in 'guioptions'. |-f|.

runtime/doc/if_pyth.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*if_pyth.txt* For Vim version 7.3. Last change: 2011 May 07
1+
*if_pyth.txt* For Vim version 7.3. Last change: 2011 Aug 19
22

33

44
VIM REFERENCE MANUAL by Paul Moore
@@ -380,7 +380,7 @@ To work around such problems there are these options:
380380
*has-python*
381381
You can test what Python version is available with: >
382382
if has('python')
383-
echo 'there is Pyton 2.x'
383+
echo 'there is Python 2.x'
384384
elseif has('python3')
385385
echo 'there is Python 3.x'
386386
endif

runtime/doc/indent.txt

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*indent.txt* For Vim version 7.3. Last change: 2011 Jul 15
1+
*indent.txt* For Vim version 7.3. Last change: 2011 Sep 02
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -132,8 +132,8 @@ The 'cinoptions' option sets how Vim performs indentation. The value after
132132
the option character can be one of these (N is any number):
133133
N indent N spaces
134134
-N indent N spaces to the left
135-
Ns N times 'shiftwidth spaces
136-
-Ns N times 'shiftwidth spaces to the left
135+
Ns N times 'shiftwidth' spaces
136+
-Ns N times 'shiftwidth' spaces to the left
137137

138138
In the list below,
139139
"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.
432432
c3 c3
433433
) && c4; ) && c4;
434434
<
435-
*cino-2*
435+
*cino-w*
436436
wN When in unclosed parentheses and N is non-zero and either
437437
using "(0" or "u0", respectively, or using "U0" and the unclosed
438438
parentheses is the first non-white character in its line, line
@@ -706,6 +706,43 @@ Indent for a continuation line: >
706706
let g:pyindent_continue = '&sw * 2'
707707
708708
709+
R *ft-r-indent*
710+
711+
Function arguments are aligned if they span for multiple lines. If you prefer
712+
do not have the arguments of functions aligned, put in your |vimrc|:
713+
>
714+
let r_indent_align_args = 0
715+
<
716+
All lines beginning with a comment character, #, get the same indentation
717+
level of the normal R code. Users of Emacs/ESS may be used to have lines
718+
beginning with a single # indented in the 40th column, ## indented as R code,
719+
and ### not indented. If you prefer that lines beginning with comment
720+
characters are aligned as they are by Emacs/ESS, put in your |vimrc|:
721+
>
722+
let r_indent_ess_comments = 1
723+
<
724+
If you prefer that lines beginning with a single # are aligned at a column
725+
different from the 40th one, you should set a new value to the variable
726+
r_indent_comment_column, as in the example below:
727+
>
728+
let r_indent_comment_column = 30
729+
<
730+
Any code after a line that ends with "<-" is indented. Emacs/ESS does not
731+
indent the code if it is a top level function. If you prefer that the
732+
Vim-R-plugin behaves like Emacs/ESS in this regard, put in your |vimrc|:
733+
>
734+
let r_indent_ess_compatible = 1
735+
<
736+
Below is an example of indentation with and without this option enabled:
737+
>
738+
### r_indent_ess_compatible = 1 ### r_indent_ess_compatible = 0
739+
foo <- foo <-
740+
function(x) function(x)
741+
{ {
742+
paste(x) paste(x)
743+
} }
744+
<
745+
709746
SHELL *ft-sh-indent*
710747

711748
The amount of indent applied under various circumstances in a shell file can

runtime/doc/index.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*index.txt* For Vim version 7.3. Last change: 2011 Jan 04
1+
*index.txt* For Vim version 7.3. Last change: 2011 Aug 06
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1261,7 +1261,7 @@ tag command action ~
12611261
|:k| :k set a mark
12621262
|:keepalt| :keepa[lt] following command keeps the alternate file
12631263
|:keepmarks| :kee[pmarks] following command keeps marks where they are
1264-
|:keepjumps| :keepj[jumps] following command keeps jumplist and marks
1264+
|:keepjumps| :keepj[umps] following command keeps jumplist and marks
12651265
|:lNext| :lN[ext] go to previous entry in location list
12661266
|:lNfile| :lNf[ile] go to last entry in previous file
12671267
|:list| :l[ist] print lines

runtime/doc/insert.txt

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*insert.txt* For Vim version 7.3. Last change: 2010 Nov 10
1+
*insert.txt* For Vim version 7.3. Last change: 2011 Sep 14
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1020,6 +1020,21 @@ On the second invocation the arguments are:
10201020
The function must return a List with the matching words. These matches
10211021
usually include the "a:base" text. When there are no matches return an empty
10221022
List.
1023+
1024+
In order to return more information than the matching words, return a Dict
1025+
that contains the List. The Dict can have these items:
1026+
words The List of matching words (mandatory).
1027+
refresh A string to control re-invocation of the function
1028+
(optional).
1029+
The only value currently recognized is "always", the
1030+
effect is that the function is called whenever the
1031+
leading text is changed.
1032+
Other items are ignored.
1033+
1034+
For example, the function can contain this: >
1035+
let matches = ... list of words ...
1036+
return {'words': matches, 'refresh': 'always'}
1037+
<
10231038
*complete-items*
10241039
Each list item can either be a string or a Dictionary. When it is a string it
10251040
is used as the completion. When it is a Dictionary it can contain these
@@ -1040,9 +1055,10 @@ items:
10401055
empty when non-zero this match will be added even when it is
10411056
an empty string
10421057

1043-
All of these except 'icase' must be a string. If an item does not meet these
1044-
requirements then an error message is given and further items in the list are
1045-
not used. You can mix string and Dictionary items in the returned list.
1058+
All of these except 'icase', 'dup' and 'empty' must be a string. If an item
1059+
does not meet these requirements then an error message is given and further
1060+
items in the list are not used. You can mix string and Dictionary items in
1061+
the returned list.
10461062

10471063
The "menu" item is used in the popup menu and may be truncated, thus it should
10481064
be relatively short. The "info" item can be longer, it will be displayed in

0 commit comments

Comments
 (0)