Permalink
Browse files

Merge branch 'vim'

Conflicts:
	src/ex_getln.c
	src/gui.c
	src/gui.h
	src/vim.h
  • Loading branch information...
2 parents 4240233 + 2bdcd40 commit c60f09b8247eaa1fa134af2dce127ebdd117da85 @b4winckler committed May 30, 2011
Showing with 2,384 additions and 7,082 deletions.
  1. +29 −0 .hgtags
  2. +0 −7 Filelist
  3. +0 −3 README_extra.txt
  4. +13 −0 runtime/doc/autocmd.txt
  5. +21 −18 runtime/doc/change.txt
  6. +12 −3 runtime/doc/eval.txt
  7. +1 −1 runtime/doc/fold.txt
  8. +13 −1 runtime/doc/if_pyth.txt
  9. +58 −7 runtime/doc/indent.txt
  10. +5 −3 runtime/doc/intro.txt
  11. +11 −9 runtime/doc/map.txt
  12. +3 −3 runtime/doc/message.txt
  13. +11 −4 runtime/doc/options.txt
  14. +3 −313 runtime/doc/os_risc.txt
  15. +30 −1 runtime/doc/os_win32.txt
  16. +13 −12 runtime/doc/quickfix.txt
  17. +3 −1 runtime/doc/syntax.txt
  18. +2 −0 runtime/doc/tags
  19. +69 −66 runtime/doc/todo.txt
  20. +2 −2 runtime/filetype.vim
  21. +6 −5 runtime/ftplugin/changelog.vim
  22. +89 −20 runtime/syntax/dnsmasq.vim
  23. +4 −4 runtime/syntax/dot.vim
  24. +7 −14 runtime/syntax/gnash.vim
  25. +27 −0 runtime/syntax/hostsaccess.vim
  26. +21 −17 runtime/syntax/ocaml.vim
  27. +533 −3 runtime/syntax/pfmain.vim
  28. +13 −10 runtime/syntax/php.vim
  29. +361 −142 runtime/syntax/readline.vim
  30. +2 −2 runtime/syntax/sysctl.vim
  31. +4 −23 src/INSTALL
  32. +0 −135 src/Make_ro.mak
  33. +2 −8 src/Makefile
  34. +2 −7 src/ascii.h
  35. +5 −3 src/auto/configure
  36. +0 −3 src/buffer.c
  37. +5 −3 src/configure.in
  38. +57 −15 src/edit.c
  39. +5 −7 src/eval.c
  40. +17 −30 src/ex_cmds.c
  41. +96 −14 src/ex_cmds2.c
  42. +15 −16 src/ex_docmd.c
  43. +38 −25 src/ex_getln.c
  44. +0 −9 src/feature.h
  45. +7 −58 src/fileio.c
  46. +1 −1 src/globals.h
  47. +4 −19 src/gui.c
  48. +1 −16 src/gui.h
  49. +0 −3,558 src/gui_riscos.c
  50. +0 −32 src/gui_riscos.h
  51. +1 −1 src/gui_w32.c
  52. +5 −2 src/if_ole.h
  53. +0 −5 src/main.c
  54. +1 −1 src/memfile.c
  55. +7 −35 src/memline.c
  56. +214 −61 src/misc1.c
  57. +10 −1 src/normal.c
  58. +1 −22 src/option.c
  59. +0 −3 src/option.h
  60. +0 −1,292 src/os_riscos.c
  61. +0 −166 src/os_riscos.h
  62. +23 −1 src/os_win32.c
  63. +0 −16 src/po/af.po
  64. +0 −18 src/po/ca.po
  65. +0 −18 src/po/de.po
  66. +0 −8 src/po/en_GB.po
  67. +0 −19 src/po/eo.po
  68. +0 −22 src/po/es.po
  69. +0 −19 src/po/fi.po
  70. +0 −18 src/po/fr.po
  71. +0 −18 src/po/ga.po
  72. +0 −18 src/po/it.po
  73. +0 −18 src/po/ja.po
  74. +0 −18 src/po/ja.sjis.po
  75. +0 −18 src/po/ko.UTF-8.po
  76. +0 −18 src/po/ko.po
  77. +0 −18 src/po/nb.po
  78. +0 −18 src/po/no.po
  79. +0 −18 src/po/pl.UTF-8.po
  80. +0 −18 src/po/pl.cp1250.po
  81. +0 −18 src/po/pl.po
  82. +0 −18 src/po/pt_BR.po
  83. +0 −18 src/po/ru.cp1251.po
  84. +0 −18 src/po/ru.po
  85. +0 −16 src/po/sk.cp1250.po
  86. +0 −16 src/po/sk.po
  87. +0 −18 src/po/sv.po
  88. +0 −21 src/po/uk.cp1251.po
  89. +0 −21 src/po/uk.po
  90. +0 −18 src/po/vi.po
  91. +0 −18 src/po/zh_CN.UTF-8.po
  92. +0 −18 src/po/zh_CN.cp936.po
  93. +0 −18 src/po/zh_CN.po
  94. +0 −18 src/po/zh_TW.UTF-8.po
  95. +0 −18 src/po/zh_TW.po
  96. +0 −6 src/proto.h
  97. +2 −0 src/proto/ex_cmds2.pro
  98. +1 −1 src/proto/ex_getln.pro
  99. +0 −66 src/proto/gui_riscos.pro
  100. +0 −49 src/proto/os_riscos.pro
  101. +1 −2 src/pty.c
  102. +12 −13 src/quickfix.c
  103. +0 −13 src/search.c
  104. +0 −8 src/structs.h
  105. +8 −4 src/syntax.c
  106. +1 −70 src/term.c
  107. +1 −1 src/termlib.c
  108. +217 −0 src/testdir/test3.in
  109. +197 −0 src/testdir/test3.ok
  110. +58 −8 src/version.c
  111. +3 −8 src/vim.h
View
@@ -1512,3 +1512,32 @@ 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
+c76efe33a3c1db5767cfa4f4bb433466cba6e351 v7-3-199
+41b17dd070295783af37698b1229a7052ab0549c v7-3-200
+78859ef2982bbc75dcfbc551e3d8a0ec5c9126eb v7-3-201
+f80e67bd627114cf7f16098ec4ed7d878816a46b v7-3-202
+ce1dce2af2a34aec196b7fbe29cf8c653b6ec6de v7-3-203
+e6ce47f06836721108394f0b921af076606cf715 v7-3-204
+8d8bd6307b1aa51fe2f592ce45d32abf0f6666d8 v7-3-205
+46544d3ae7ecb245a2646ae5005a3d67ca380f88 v7-3-206
View
@@ -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 \
View
@@ -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.
@@ -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
@@ -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
View
@@ -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
@@ -6225,7 +6233,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.
@@ -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.
@@ -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:
Oops, something went wrong.

0 comments on commit c60f09b

Please sign in to comment.