Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'vim'

Conflicts:
	src/ex_getln.c
	src/gui.c
	src/gui.h
	src/vim.h
  • Loading branch information...
commit c60f09b8247eaa1fa134af2dce127ebdd117da85 2 parents 4240233 + 2bdcd40
@b4winckler b4winckler authored
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
29 .hgtags
@@ -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
7 Filelist
@@ -427,9 +427,6 @@ 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 \
@@ -437,10 +434,6 @@ SRC_EXTRA = \
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
3  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.
View
13 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
View
39 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
View
15 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
@@ -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.
View
2  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.
View
14 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:
View
65 runtime/doc/indent.txt
@@ -128,13 +128,20 @@ have changed the indent by typing <BS>, <Tab>, or <Space> in the indent or
used CTRL-T or CTRL-D.
*cinoptions-values*
-The 'cinoptions' option sets how Vim performs indentation. In the list below,
+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
+
+In the list below,
"N" represents a number of your choice (the number can be negative). When
there is an 's' after the number, Vim multiplies the number by 'shiftwidth':
"1s" is 'shiftwidth', "2s" is two times 'shiftwidth', etc. You can use a
-decimal point, too: "-0.5s" is minus half a 'shiftwidth'. The examples below
-assume a 'shiftwidth' of 4.
-
+decimal point, too: "-0.5s" is minus half a 'shiftwidth'.
+The examples below assume a 'shiftwidth' of 4.
+ *cino->*
>N Amount added for "normal" indent. Used after a line that should
increase the indent (lines starting with "if", an opening brace,
etc.). (default 'shiftwidth').
@@ -145,6 +152,7 @@ assume a 'shiftwidth' of 4.
foo; foo; foo;
} } }
<
+ *cino-e*
eN Add N to the prevailing indent inside a set of braces if the
opening brace at the End of the line (more precise: is not the
first character in a line). This is useful if you want a
@@ -160,6 +168,7 @@ assume a 'shiftwidth' of 4.
bar; bar; bar;
} } }
<
+ *cino-n*
nN Add N to the prevailing indent for a statement after an "if",
"while", etc., if it is NOT inside a set of braces. This is
useful if you want a different indent when there is no '{'
@@ -174,6 +183,7 @@ assume a 'shiftwidth' of 4.
bar; bar; bar;
} } }
<
+ *cino-f*
fN Place the first opening brace of a function or other block in
column N. This applies only for an opening brace that is not
inside other braces and is at the start of the line. What comes
@@ -184,6 +194,7 @@ assume a 'shiftwidth' of 4.
{ { {
int foo; int foo; int foo;
<
+ *cino-{*
{N Place opening braces N characters from the prevailing indent.
This applies only for opening braces that are inside other
braces. (default 0).
@@ -193,6 +204,7 @@ assume a 'shiftwidth' of 4.
{ { {
foo; foo; foo;
<
+ *cino-}*
}N Place closing braces N characters from the matching opening
brace. (default 0).
@@ -202,6 +214,7 @@ assume a 'shiftwidth' of 4.
foo; foo; foo;
} } }
<
+ *cino-^*
^N Add N to the prevailing indent inside a set of braces if the
opening brace is in column 0. This can specify a different
indent for whole of a function (some may like to set it to a
@@ -216,6 +229,7 @@ assume a 'shiftwidth' of 4.
} } }
} } }
<
+ *cino-L*
LN Controls placement of jump labels. If N is negative, the label
will be placed at column 1. If N is non-negative, the indent of
the label will be the prevailing indent minus N. (default -1).
@@ -229,6 +243,7 @@ assume a 'shiftwidth' of 4.
} } }
} } }
<
+ *cino-:*
:N Place case labels N characters from the indent of the switch().
(default 'shiftwidth').
@@ -240,6 +255,7 @@ assume a 'shiftwidth' of 4.
default: default:
} }
<
+ *cino-=*
=N Place statements occurring after a case label N characters from
the indent of the label. (default 'shiftwidth').
@@ -247,6 +263,7 @@ assume a 'shiftwidth' of 4.
case 11: case 11: a = a + 1;
a = a + 1; b = b + 1;
<
+ *cino-l*
lN If N != 0 Vim will align with a case label instead of the
statement after it in the same line.
@@ -256,6 +273,7 @@ assume a 'shiftwidth' of 4.
break; break;
} }
<
+ *cino-b*
bN If N != 0 Vim will align a final "break" with the case label,
so that case..break looks like a sort of block. (default: 0).
When using 1, consider adding "0=break" to 'cinkeys'.
@@ -272,6 +290,7 @@ assume a 'shiftwidth' of 4.
break; break;
} }
<
+ *cino-g*
gN Place C++ scope declarations N characters from the indent of the
block they are in. (default 'shiftwidth'). A scope declaration
can be "public:", "protected:" or "private:".
@@ -283,6 +302,7 @@ assume a 'shiftwidth' of 4.
private: private:
} }
<
+ *cino-h*
hN Place statements occurring after a C++ scope declaration N
characters from the indent of the label. (default
'shiftwidth').
@@ -291,6 +311,21 @@ assume a 'shiftwidth' of 4.
public: public: a = a + 1;
a = a + 1; b = b + 1;
<
+ *cino-N*
+ NN Indent inside C++ namespace N characters extra compared to a
+ normal block. (default 0).
+
+ cino= cino=N-s >
+ namespace { namespace {
+ void function(); void function();
+ } }
+
+ namespace my namespace my
+ { {
+ void function(); void function();
+ } }
+<
+ *cino-p*
pN Parameter declarations for K&R-style function declarations will
be indented N characters from the margin. (default
'shiftwidth').
@@ -300,6 +335,7 @@ assume a 'shiftwidth' of 4.
int a; int a; int a;
char b; char b; char b;
<
+ *cino-t*
tN Indent a function return type declaration N characters from the
margin. (default 'shiftwidth').
@@ -307,6 +343,7 @@ assume a 'shiftwidth' of 4.
int int int
func() func() func()
<
+ *cino-i*
iN Indent C++ base class declarations and constructor
initializations, if they start in a new line (otherwise they
are aligned at the right side of the ':').
@@ -320,6 +357,7 @@ assume a 'shiftwidth' of 4.
BaseClass(3) BaseClass(3)
{} {}
<
+ *cino-+*
+N Indent a continuation line (a line that spills onto the next)
inside a function N additional characters. (default
'shiftwidth').
@@ -330,6 +368,7 @@ assume a 'shiftwidth' of 4.
a = b + 9 * a = b + 9 *
c; c;
<
+ *cino-c*
cN Indent comment lines after the comment opener, when there is no
other text with which to align, N characters from the comment
opener. (default 3). See also |format-comments|.
@@ -339,6 +378,7 @@ assume a 'shiftwidth' of 4.
text. text.
*/ */
<
+ *cino-C*
CN When N is non-zero, indent comment lines by the amount specified
with the c flag above even if there is other text behind the
comment opener. (default 0).
@@ -349,12 +389,14 @@ assume a 'shiftwidth' of 4.
********/ ********/
< (Example uses ":set comments& comments-=s1:/* comments^=s0:/*")
+ *cino-/*
/N Indent comment lines N characters extra. (default 0).
cino= cino=/4 >
a = b; a = b;
/* comment */ /* comment */
c = d; c = d;
<
+ *cino-(*
(N When in unclosed parentheses, indent N characters from the line
with the unclosed parentheses. Add a 'shiftwidth' for every
unclosed parentheses. When N is 0 or the unclosed parentheses
@@ -370,6 +412,7 @@ assume a 'shiftwidth' of 4.
(c2 || c3)) (c2 || c3))
{ {
<
+ *cino-u*
uN Same as (N, but for one level deeper. (default 'shiftwidth').
cino= cino=u2 >
@@ -377,6 +420,7 @@ assume a 'shiftwidth' of 4.
&& (c22345 && (c22345
|| c3)) || c3))
<
+ *cino-U*
UN When N is non-zero, do not ignore the indenting specified by
( or u in case that the unclosed parentheses is the first
non-white character in its line. (default 0).
@@ -388,6 +432,7 @@ assume a 'shiftwidth' of 4.
c3 c3
) && c4; ) && c4;
<
+ *cino-2*
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
@@ -400,6 +445,7 @@ assume a 'shiftwidth' of 4.
|| c3)) || c3))
foo; foo;
<
+ *cino-W*
WN When in unclosed parentheses and N is non-zero and either
using "(0" or "u0", respectively and the unclosed parentheses is
the last non-white character in its line and it is not the
@@ -414,6 +460,7 @@ assume a 'shiftwidth' of 4.
a_short_line(argument, a_short_line(argument,
argument); argument);
<
+ *cino-m*
mN When N is non-zero, line up a line starting with a closing
parentheses with the first character of the line with the
matching opening parentheses. (default 0).
@@ -428,6 +475,7 @@ assume a 'shiftwidth' of 4.
) )
foo; foo;
<
+ *cino-M*
MN When N is non-zero, line up a line starting with a closing
parentheses with the first character of the previous line.
(default 0).
@@ -437,7 +485,7 @@ assume a 'shiftwidth' of 4.
cond2 cond2
) )
<
- *java-cinoptions* *java-indenting*
+ *java-cinoptions* *java-indenting* *cino-j*
jN Indent java anonymous classes correctly. The value 'N' is
currently unused but must be non-zero (e.g. 'j1'). 'j1' will
indent for example the following code snippet correctly: >
@@ -448,7 +496,7 @@ assume a 'shiftwidth' of 4.
}
});
<
- *javascript-cinoptions* *javascript-indenting*
+ *javascript-cinoptions* *javascript-indenting* *cino-J*
JN Indent JavaScript object declarations correctly by not confusing
them with labels. The value 'N' is currently unused but must be
non-zero (e.g. 'J1'). >
@@ -466,16 +514,19 @@ assume a 'shiftwidth' of 4.
}
}
<
+ *cino-)*
)N Vim searches for unclosed parentheses at most N lines away.
This limits the time needed to search for parentheses. (default
20 lines).
+ *cino-star*
*N Vim searches for unclosed comments at most N lines away. This
limits the time needed to search for the start of a comment.
If your /* */ comments stop indenting afer N lines this is the
value you will want to change.
(default 70 lines).
+ *cino-#*
#N When N is non-zero recognize shell/Perl comments, starting with
'#'. Default N is zero: don't recognizes '#' comments. Note
that lines starting with # will still be seen as preprocessor
@@ -483,7 +534,7 @@ assume a 'shiftwidth' of 4.
The defaults, spelled out in full, are:
- cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,ps,ts,is,+s,
+ cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,N0,ps,ts,is,+s,
c3,C0,/0,(2s,us,U0,w0,W0,m0,j0,J0,)20,*70,#0
Vim puts a line in column 1 if:
View
8 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 <bugs@vim.org>
-This is not a maillist but the message is redirected to the Vim maintainer.
+Send bug reports to: Vim Developers <vim_dev@vim.org>
+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 <bugs@vim.org>, 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
View
20 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
View
6 runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt* For Vim version 7.3. Last change: 2011 Jan 30
+*message.txt* For Vim version 7.3. Last change: 2011 May 10
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -27,8 +27,8 @@ The "g<" command can be used to see the last page of previous command output.
This is especially useful if you accidentally typed <Space> at the hit-enter
prompt. You are then back at the hit-enter prompt and can then scroll further
back.
-Note: when you stopped the output with "q" at the more prompt only up to that
-point will be displayed.
+Note: If the output has been stopped with "q" at the more prompt, it will only
+be displayed up to this point.
The previous command output is cleared when another command produces output.
If you are using translated messages, the first printed line tells who
View
15 runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.3. Last change: 2011 Apr 15
+*options.txt* For Vim version 7.3. Last change: 2011 May 17
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -820,7 +820,7 @@ A jump table for the options with a short description can be found at |Q_op|.
been set.
*'background'* *'bg'*
-'background' 'bg' string (default "dark" or "light")
+'background' 'bg' string (default "dark" or "light", see below)
global
{not in Vi}
When set to "dark", Vim will try to use colors that look good on a
@@ -854,6 +854,12 @@ A jump table for the options with a short description can be found at |Q_op|.
color). To get around this, force the GUI window to be opened by
putting a ":gui" command in the .gvimrc file, before where the value
of 'background' is used (e.g., before ":syntax on").
+
+ For MS-DOS, Windows and OS/2 the default is "dark".
+ For other systems "dark" is used when 'term' is "linux",
+ "screen.linux", "cygwin" or "putty", or $COLORFGBG suggests a dark
+ background. Otherwise the default is "light".
+
Normally this option would be set in the .vimrc file. Possibly
depending on the terminal name. Example: >
:if &term == "pcterm"
@@ -3099,7 +3105,7 @@ A jump table for the options with a short description can be found at |Q_op|.
closed. Also for manually closed folds. With the default value of
one a fold can only be closed if it takes up two or more screen lines.
Set to zero to be able to close folds of just one screen line.
- Note that this only has an effect of what is displayed. After using
+ Note that this only has an effect on what is displayed. After using
"zc" to close a fold, which is displayed open because it's smaller
than 'foldminlines', a following "zc" may close a containing fold.
@@ -4199,7 +4205,8 @@ A jump table for the options with a short description can be found at |Q_op|.
It is used when a new line is created, for the |=| operator and
in Insert mode as specified with the 'indentkeys' option.
When this option is not empty, it overrules the 'cindent' and
- 'smartindent' indenting.
+ 'smartindent' indenting. When 'lisp' is set, this option is
+ overridden by the Lisp indentation algorithm.
When 'paste' is set this option is not used for indenting.
The expression is evaluated with |v:lnum| set to the line number for
which the indent is to be computed. The cursor is also in this line
View
316 runtime/doc/os_risc.txt
@@ -1,322 +1,12 @@
-*os_risc.txt* For Vim version 7.3. Last change: 2010 Aug 07
+*os_risc.txt* For Vim version 7.3. Last change: 2011 May 10
VIM REFERENCE MANUAL by Thomas Leonard
*riscos* *RISCOS* *RISC-OS*
-This file contains the particularities for the RISC OS version of Vim.
+The RISC OS support has been removed from Vim with patch 7.3.187.
+If you would like to use Vim on RISC OS get the files from before that patch.
-The RISC OS port is a completely new port and is not based on the old "archi"
-port.
-1. File locations |riscos-locations|
-2. Filename munging |riscos-munging|
-3. Command-line use |riscos-commandline|
-4. Desktop (GUI) use |riscos-gui|
-5. Remote use (telnet) |riscos-remote|
-6. Temporary files |riscos-temp-files|
-7. Interrupting |riscos-interrupt|
-8. Memory usage |riscos-memory|
-9. Filetypes |riscos-filetypes|
-10. The shell |riscos-shell|
-11. Porting new releases |riscos-porting|
-
-If I've missed anything, email me and I'll try to fix it. In fact, even if I
-haven't missed anything then email me anyway to give me some confidence that it
-actually works!
-
-Thomas Leonard <tal197@ecs.soton.ac.uk>
-
- [these URLs no longer work...]
- Port homepage: http://www.ecs.soton.ac.uk/~tal197/
- or try: http://www.soton.ac.uk/~tal197/
-
-==============================================================================
- *riscos-locations*
-1. File locations
-
-The Vim executable and shared resource files are all stored inside the !Vim
-application directory.
-
-When !Vim is first seen by the filer, it aliases the *vi and *ex commands to
-run the command-line versions of Vim (see |riscos-commandline|).
-
-!Vim.Resources and !Vim.Resources2 contain the files from the standard Vim
-distribution, but modified slightly to work within the limits of ADFS, plus
-some extra files such as the window templates.
-
-User choices are read from "Choices:*" and are saved to "<Choices$Write>.*".
-If you have the new !Boot structure then these should be set up already. If
-not, set Choices$Path to a list of directories to search when looking for
-user configuration files. Set Choices$Write to the directory you want files
-to be saved into (so your search patterns and marks can be remembered between
-sessions).
-
-==============================================================================
- *riscos-munging*
-2. Filename munging
-
-All pathname munging is disabled by default, so Vim should behave like a
-normal RISC OS application now. So, if you want to edit "doc/html" then you
-actually type "*vi doc/html".
-
-The only times munging is done is when:
-
-- Searching included files from C programs, since these are always munged.
- See |[I|.
- Note: make sure you are in the right directory when you use this
- command (i.e. the one with subdirectories "c" and "h").
-
-- Sourcing files using |:so|.
- Paths starting "$VIM/" are munged like this:
-
- $VIM/syntax/help.vim -> Vim:syntax.help
-
- Also, files ending in ".vim" have their extensions removed, and slashes
- replaced with dots.
-
-Some tag files and script files may have to be edited to work under this port.
-
-==============================================================================
- *riscos-commandline*
-3. Command-line use
-
-To use Vim from the command-line use the "*vi" command (or "*ex" for
-|Ex-mode|).
-
-Type "*vi -h" for a list of options.
-
-Running the command-line version of Vim in a large high-color mode may cause
-the scrolling to be very slow. Either change to a mode with fewer colors or
-use the GUI version.
-
-Also, holding down Ctrl will slow it down even more, and Ctrl-Shift will
-freeze it, as usual for text programs.
-
-==============================================================================
- *riscos-gui*
-4. Desktop use
-
-Limitations:
-
-- Left scrollbars don't work properly (right and bottom are fine).
-- Doesn't increase scroll speed if it gets behind.
-
-You can resize the window by dragging the lower-right corner, even though
-there is no icon shown there.
-
-You can use the --rows and --columns arguments to specify the initial size of
-the Vim window, like this: >
-
- *Vi -g --rows 20 --columns 80
-
-The global clipboard is supported, so you can select some text and then
-paste it directly into another application (provided it supports the
-clipboard too).
-
-Clicking Menu now opens a menu like a normal RISC OS program. Hold down Shift
-when clicking Menu to paste (from the global clipboard).
-
-Dragging a file to the window replaces the CURRENT buffer (the one with the
-cursor, NOT the one you dragged to) with the file.
-
-Dragging with Ctrl held down causes a new Vim window to be opened for the
-file (see |:sp|).
-
-Dragging a file in with Shift held down in insert mode inserts the pathname of
-the file.
-
-:browse :w opens a standard RISC OS save box.
-:browse :e opens a directory viewer.
-
-For fonts, you have the choice of the system font, an outline font, the system
-font via ZapRedraw and any of the Zap fonts via ZapRedraw: >
-
- :set guifont=
-< To use the system font via the VDU drivers. Supports
- bold and underline.
->
- :set guifont=Corpus.Medium
-< Use the named outline font. You can use any font, but
- only monospaced ones like Corpus look right.
->
- :set guifont=Corpus.Medium:w8:h12:b:i
-< As before, but with size of 8 point by 12 point, and
- in bold italic.
- If only one of width and height is given then that
- value is used for both. If neither is given then 10
- point is used.
-
-Thanks to John Kortink, Vim can use the ZapRedraw module. Start the font name
-with "!" (or "!!" for double height), like this: >
-
- :set guifont=!!
-< Use the system font, but via ZapRedraw. This gives a
- faster redraw on StrongARM processors, but you can't
- get bold or italic text. Double height.
->
- :set guifont=!script
-< Uses the named Zap font (a directory in VimFont$Path).
- The redraw is the same speed as for "!!", but you get
- a nicer looking font.
- Only the "man+" and "script" fonts are supplied
- currently, but you can use any of the Zap fonts if
- they are in VimFont$Path.
- Vim will try to load font files "0", "B", "I" and "IB"
- from the named directory. Only "0" (normal style) MUST
- be present. Link files are not currently supported.
-
-Note that when using ZapRedraw the edit bar is drawn in front of the character
-you are on rather than behind it. Also redraw is incorrect for screen modes
-with eigen values of 0. If the font includes control characters then you can
-get Vim to display them by changing the 'isprint' option.
-
-If you find the scrolling is too slow on your machine, try experimenting
-with the 'scrolljump' and 'ttyscroll' options.
-
-In particular, StrongARM users may find that: >
-
- :set ttyscroll=0
-
-makes scrolling faster in high-color modes.
-
-=============================================================================
- *riscos-remote*
-5. Remote use (telnet)
-
-I have included a built-in termcap entry, but you can edit the termcap file to
-allow other codes to be used if you want to use Vim from a remote terminal.
-
-Although I do not have an internet connection to my Acorn, I have managed to
-run Vim in a FreeTerm window using the loopback connection.
-
-It seems to work pretty well now, using "*vi -T ansi".
-
-==============================================================================
- *riscos-temp-files*
-6. Temporary files
-
-If Vim crashes then the swap and backup files (if any) will be in the
-directories set with the 'directory' and 'bdir' options. By default the swap
-files are in <Wimp$ScrapDir> (i.e. inside !Scrap) and backups are in the
-directory you were saving to. Vim will allow you to try and recover the file
-when you next try to edit it.
-
-To see a list of swap files, press <F12> and type "*vi -r".
-
-Vim no longer brings up ATTENTION warnings if you try to edit two files with
-the same name in different directories.
-
-However, it also no longer warns if you try to edit the same file twice (with
-two copies of Vim), though you will still be warned when you save that the
-datestamp has changed.
-
-==============================================================================
- *riscos-interrupt*
-7. Interrupting
-
-To break out of a looping macro, or similar, hold down Escape in the
-command-line version, or press CTRL-C in the GUI version.
-
-==============================================================================
- *riscos-memory*
-8. Memory usage
-
-Vim will use dynamic areas on RISC OS 3.5 or later. If you can use them on
-older machines then edit the !RunTxt and GVim files. I don't know what UnixLib
-does by default on these machines so I'm playing safe.
-
-It doesn't work at all well without dynamic areas, since it can't change its
-memory allocation once running. Hence you should edit "!Vim.GVim" and
-"!Vim.!RunTxt" to choose the best size for you. You probably need at least
-about 1400K.
-
-==============================================================================
- *riscos-filetypes*
-9. Filetypes
-
-You can now specify that autocommands are only executed for files of certain
-types. The filetype is given in the form &xxx, when xxx is the filetype.
-
-Filetypes must be specified by number (e.g. &fff for Text).
-
-The system has changed from version 5.3. The new sequence of events is:
-
-- A file is loaded. |'osfiletype'| is set to the RISC OS filetype.
-- Based on the filetype and pathname, Vim will try to set |'filetype'| to the
- Vim-type of the file.
-- Setting this option may load syntax files and perform other actions.
-- Saving the file will give it a filetype of |'osfiletype'|.
-
-Some examples may make this clearer:
-
- Kind of file loaded osfiletype filetype ~
- C code "c.hellow" Text (&fff) C
- LaTeX document LaTeX (&2a8) TeX
- Draw document DrawFile (&aff) (not changed)
-
-==============================================================================
- *riscos-shell*
-10. The shell
-
-- Bangs (!s) are only replaced if they are followed by a space or end-of-line,
- since many pathnames contain them.
-
-- You can prefix the command with "~", which stops any output from being
- displayed. This also means that you don't have to press <Enter> afterwards,
- and stops the screen from being redrawn. {only in the GUI version}
-
-==============================================================================
- *riscos-porting*
-11. Porting new releases to RISC OS
-
-Downloading everything you need:
-
-- Get the latest source distribution (see www.vim.org)
-- Get the runtime environment files (e.g. these help files)
-- Get the RISC OS binary distribution (if possible)
-
-
-Unarchiving:
-
-- Create a raFS disk and put the archives on it
-- Un-gzip them
-- Un-tar them (*tar xELf 50 archive/tar)
-
-
-Recompiling the sources:
-
-- Create c, s, and h directories.
-- Put all the header files in "h". \
-- Put all the C files in "c". | And lose the extensions
-- Put the assembler file ("swis/s") in "s". /
-- Rename all the files in "proto" to "h", like this:
- raFS::VimSrc.source.proto.file/pro
- becomes
- raFS::VimSrc.source.h.file_pro
-- In the files "h.proto" and "c.termlib", search and replace
- .pro"
- with
- _pro.h"
-- Create a simple Makefile if desired and do "*make -k".
- Use "CC = gcc -DRISCOS -DUSE_GUI -O2 -x c" in the Makefile.
-- Save the binary as !Vim.Vim in the binary distribution.
-
-
-Updating the run-time environment:
-
-- Replace old or missing files inside !Vim.Resources with the
- new files.
-- Remove files in "doc" not ending in "/txt", except for "tags".
-- Lose the extensions from the files in "doc".
-- Edit the "doc.tags" file. Remove extensions from the second column: >
- :%s/^\(.[^\t]*\t.*\)\.txt\t/\1\t/
-- Remove extensions from the syntax files. Split them into two directories
- to avoid the 77 entry limit on old ADFS filesystems.
-- Edit "Vim:FileType" to match "*.c.*" as well as "*/c" and so on.
- Add filetype checking too.
-- Edit "Vim:Menu" and remove all the keys from the menus: >
- :%s/<Tab>[^ \t]*//
-<
vim:tw=78:ts=8:ft=help:norl:
View
31 runtime/doc/os_win32.txt
@@ -313,7 +313,36 @@ A. When using :! to run an external command, you can run it with "start": >
with :!start do not get passed Vim's open file handles, which means they do
not have to be closed before Vim.
To avoid this special treatment, use ":! start".
- The optional "/min" argument causes the window to be minimized.
+ There are two optional arguments (see the next Q):
+ /min the window will be minimized.
+ /b" no console window will be opened
+ You can only one of these flags at a time. A second second one will be
+ treated as the start of the command.
+
+Q. How do I avoid getting a window for programs that I run asynchronously?
+A. You have two possible solutions depending on what exactly do you want:
+ 1) You may use the /min flag that would run program in minimized state with
+ no other changes. It will work equally for console and GUI applications.
+ 2) You can use /b flag to run console applications without creating a
+ console window for them (GUI applications are not affected). But you
+ should use this flag only if application you run doesn't require any
+ input. Otherwise it will get an EOF error because it's input stream
+ (stdin) would be redirected to \\.\NUL (stdour and stderr too).
+
+ Example for a console application, run Exuberant ctags: >
+ :!start /min ctags -R .
+< When it has finished you should see file named "tags" in your current
+ directory. You should notice the window title blinking on your taskbar.
+ This is more noticable for commands that take longer.
+ Now delete the "tags" file and run this command: >
+ :!start /b ctags -R .
+< You should have the same "tags" file, but this time there will be no
+ blinking on the taskbar.
+ Example for a GUI application: >
+ :!start /min notepad
+ :!start /b notepad
+< The first command runs notepad minimized and the second one runs it
+ normally.
Q. I'm using Win32s, and when I try to run an external command like "make",
Vim doesn't wait for it to finish! Help!
View
25 runtime/doc/quickfix.txt
@@ -1,4 +1,4 @@
-*quickfix.txt* For Vim version 7.3. Last change: 2011 Feb 01
+*quickfix.txt* For Vim version 7.3. Last change: 2011 May 10
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -215,28 +215,29 @@ command with 'l'.
*:cex* *:cexpr* *E777*
:cex[pr][!] {expr} Create a quickfix list using the result of {expr} and
- jump to the first error. If {expr} is a String, then
- each new-line terminated line in the String is
- processed using 'errorformat' and the result is added
- to the quickfix list. If {expr} is a List, then each
- String item in the list is processed and added to the
- quickfix list. Non String items in the List are
- ignored. See |:cc|
- for [!].
+ jump to the first error.
+ If {expr} is a String, then each new-line terminated
+ line in the String is processed using the global value
+ of 'errorformat' and the result is added to the
+ quickfix list.
+ If {expr} is a List, then each String item in the list
+ is processed and added to the quickfix list. Non
+ String items in the List are ignored.
+ See |:cc| for [!].
Examples: >
:cexpr system('grep -n xyz *')
:cexpr getline(1, '$')
<
*:lex* *:lexpr*
-:lex[pr][!] {expr} Same as ":cexpr", except the location list for the
+:lex[pr][!] {expr} Same as |:cexpr|, except the location list for the
current window is used instead of the quickfix list.
*:cgete* *:cgetexpr*
:cgete[xpr] {expr} Create a quickfix list using the result of {expr}.
- Just like ":cexpr", but don't jump to the first error.
+ Just like |:cexpr|, but don't jump to the first error.
*:lgete* *:lgetexpr*
-:lgete[xpr] {expr} Same as ":cgetexpr", except the location list for the
+:lgete[xpr] {expr} Same as |:cgetexpr|, except the location list for the
current window is used instead of the quickfix list.
*:cad* *:caddexpr*
View
4 runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 7.3. Last change: 2011 Apr 06
+*syntax.txt* For Vim version 7.3. Last change: 2011 May 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1102,6 +1102,8 @@ your .vimrc: >
FLEXWIKI *flexwiki.vim* *ft-flexwiki-syntax*
FlexWiki is an ASP.NET-based wiki package available at http://www.flexwiki.com
+NOTE: this site currently doesn't work, on Wikipedia is mentioned that
+development stopped in 2009.
Syntax highlighting is available for the most common elements of FlexWiki
syntax. The associated ftplugin script sets some buffer-local options to make
View
2  runtime/doc/tags
@@ -4281,6 +4281,7 @@ E847 syntax.txt /*E847*
E848 syntax.txt /*E848*
E849 syntax.txt /*E849*
E85 options.txt /*E85*
+E850 change.txt /*E850*
E86 windows.txt /*E86*
E87 windows.txt /*E87*
E88 windows.txt /*E88*
@@ -6114,6 +6115,7 @@ hangul hangulin.txt /*hangul*
hangulin.txt hangulin.txt /*hangulin.txt*
has() eval.txt /*has()*
has-patch eval.txt /*has-patch*
+has-python if_pyth.txt /*has-python*
has_key() eval.txt /*has_key()*
haskell.vim syntax.txt /*haskell.vim*
haslocaldir() eval.txt /*haslocaldir()*
View
135 runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.3. Last change: 2011 Apr 28
+*todo.txt* For Vim version 7.3. Last change: 2011 May 19
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -32,36 +32,31 @@ be worked on, but only if you sponsor Vim development. See |sponsor|.
Go through more coverity reports.
-Patch for behavior of :cwindow. (Ingo Karkat, 2011 Apr 15)
-
-Configure fix for finding exctags. (Hong Xu, 2011 Aprl 2)
-
-When 'colorcolumn' is set locally to a window, ":new" opens a window with the
-same highlighting but 'colorcolumn' is empty. (Tyru, 2010 Nov 15)
-Patch by Christian Brabandt, 2011 Feb 13 (but move further down).
-
-Patch for configure related to Ruby on Mac OS X. (Bjorn Winckler, 2011 Jan 14)
-
-Patch to make mkdir() work properly for different encodings. (Yukihiro
-Nakadaira, 2011 Apr 23)
-
-Updated PHP syntax file. (Jason Woofenden, 2011 Apr 22)
-
-ASCII Vim logo's (Erling Westenvik, 2011 Apr 19) Add to website.
+Hong Xu: I think src/Make_ro.mak should also be removed.
+Two patches 2011 May 15
Crash in autocomplete, valgrind log. (Greg Weber, 2011 Apr 22)
-Patch for static code analysis errors in riscOS. (Dominique Pelle, 2010 Dec 3)
+Ex command ":s/ \?/ /g" splits multi-byte characters into bytes. (Dominique
+Pelle, 2011 May 7).
-Patch to set v:register on startup. (Ingo Karkat, 2011 Jan 16)
+In command line window ":close" doesn't work properly. (Tony Mechelynck, 2009
+Jun 1)
+Patch by Jean-Rene David, 2011 Apr 30.
-Risc OS gui has obvious errors. Drop it?
+When "b" is a symlink to directory "a", resolve("b/") doesn't result in "a/".
+(ZyX, 2011 Feb 12)
+Patch by Jean-Rene David, 2011 Apr 30.
Patch to set v:register default depending on "unnamed" in 'clipboard'. (Ingo
Karkat, 2011 Jan 16)
Patch to add 'cscoperelative'. (Raghavendra Prabhu, 2011 Apr 18)
+9 "} else" causes following lines to be indented too much. (Rouben
+ Rostamian, 2008 Aug 30)
+Patch by Lech Lorens, 2011 May 16, with more tests.
+
New syntax file for dnsmasq. (Thilo Six, 2011 Apr 18)
Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
@@ -83,6 +78,8 @@ Lepa, 2011 Jan 18)
Patch to support ":!start /b cmd". (Xaizek, 2010 Dec 22)
+Patch for syntax "extend" not working correctly. (Ben Schmidt, 2011 May 15)
+
Patch to build with GTK on Mac. (Ben Schmidt, 2011 Jan 18)
Use another name instead of FEAT_GUI_ELSEWHERE.
@@ -96,6 +93,11 @@ Patch to improve optwin.vim. (ZyX, 2011 Jan 29)
Patch for Python 3 support. (lilydjwg, 2011 Feb 24)
+Patch to make putting from clipboard linewise when the text ends in a newline.
+(Sung Pae) Do we want this?
+
+Patch to add third dict argument to sort(). (ZyX, 2011 May 15)
+
Building the MingW version without clipboard but with multi-byte doesn't
work. (Bill Lam, 2010 Sep 18)
@@ -105,12 +107,26 @@ Patch for handling of NL in substitute() with \= expression. (Motoya Kurotsu,
Patch to disallow fork() when __APPLE__ is defined. (Hisashi T Fujinaka, 2010
Nov 25)
+7 Output for ":scriptnames" and ":breaklist" should shorten the file names:
+ use "~/" when possible.
+Patch by Jean-Rene David, 2011 May 1.
+
+Patch for better #if 0 syntax highlighting for C code. (Ben Schmidt, 2011 Jan
+20)
+Change to C syntax folding to make it work much faster, but a bit less
+reliable. (Lech Lorens, 2009 Nov 9) Enable with an option?
+Most time is spent in in_id_list().
+Updated to merge both patches. (Ben Schmidt, 2011 May 2)
+
GTK: Patch to fix menu popping down. (Hong Xu, 2010 Dec 4, Dec 5)
Update 2011 Feb 3.
Patch to use pipes on Win32. (Vincent Berthoux, 2011 Feb 28)
Update Mar 1 using 'shelltemp'.
+Patch to support UTF-8 for Hangul. (Shawn Y.H. Kim, 2011 May 1)
+Needs more work.
+
"gh<Del>" deletes the current line, except when it's the last line.
Hint by Christian Brabandt, 2011 Mar 22
@@ -127,6 +143,10 @@ problems, even though double quotes are used. (Manuel Stol, 2011 Mar 9)
Patch to change the meaning of \n in substitute(). (motoya kurotsu, 2011 Mar 8)
+Gui menu edit/paste in block mode insert only inserts in one line (Bjorn
+Winckler, 2011 May 11)
+Use function to set paste option and restore it, use CTRL-R+ to paste.
+
Help file foldexpr (ZyX)
Syntax region with 'concealends' and a 'cchar' value, 'conceallevel' set to 2,
@@ -150,8 +170,15 @@ The error was 'RenderBadPicture (invalid Picture parameter)'.
backtrace from your debugger if you break on the gdk_x_error() function.)
Check that number of pixels doesn't go above 65535?
+8 Add an event like CursorHold that is triggered repeatedly, not just once
+ after typing something.
+Need for CursorHold that retriggers. Use a key that doesn't do anything, or a
+function that resets did_cursorhold.
+Patch by Christian Brabandt, 2011 May 6.
+
CursorHold repeats typed key when it's the start of a mapping.
(Will Gray, 2011 Mar 23)
+Christian Brabandt: problem is that OP_PENDING isn't set.
Windows keys not set properly on Windows 7? (cncyber, 2010 Aug 26)
@@ -312,9 +339,6 @@ mkdir().
When 'paste' is changed with 'pastetoggle', the ruler doesn't reflect this
right away. (Samuel Ferencik, 2010 Dec 7)
-Windows installer: licence text should not use indent, causes bad word wrap.
-(Benjamin Fritz, 2010 Aug 16)
-
Mac with X11: clipboard doesn't work properly. (Raf, 2010 Aug 16)
Using CompilerSet doesn't record where an option was set from. E.g., in the
@@ -357,11 +381,6 @@ Can 'undolevels' be a buffer-local option? Helps for making big changes in
one file only, set 'ul' to -1 only for that buffer.
Patch by Christian Brabandt, 2010 Dec 17. Needs test.
-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)
@@ -372,11 +391,6 @@ 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)
-8 Add an event like CursorHold that is triggered repeatedly, not just once
- after typing something.
-Need for CursorHold that retriggers. Use a key that doesn't do anything, or a
-function that resets did_cursorhold.
-
Cscope "cs add" stopped working somewhat before 7.2.438. (Gary Johnson, 2010
Jun 29) Caused by 7.2.433?
@@ -401,8 +415,6 @@ Shell not recognized properly if it ends in "csh -f". (James Vega, 2009 Nov 3)
Find tail? Might have a / in argument. Find space? Might have space in
path.
-":sort n" treats empty line as higher than zero. (Beeyawned, 2010 Oct 13)
-
Test 51 fails when language set to German. (Marco, 2011 Jan 9)
Dominique can't reproduc it.
@@ -440,13 +452,6 @@ Undo problem: line not removed as expected when using setline() from Insert
mode. (Israel Chauca, 2010 May 13, more in second msg)
Break undo when CTRL-R = changes the text? Or save more lines?
-Patch for better #if 0 syntax highlighting for C code. (Ben Schmidt, 2011 Jan
-20)
-
-Change to C syntax folding to make it work much faster, but a bit less
-reliable. (Lech Lorens, 2009 Nov 9) Enable with an option?
-Most time is spent in in_id_list().
-
Slow combination of folding and PHP syntax highlighting. Script to reproduce
it. Caused by "syntax sync fromstart" in combination with patch 7.2.274.
(Christian Brabandt, 2010 May 27)
@@ -459,9 +464,6 @@ Disable updating folds while completion is active? (Peter Odding, 2010 Jun 9)
Using ":call foo#d.f()" doesn't autoload the "foo.vim" file. Works OK for
echo, just not for ":call" and ":call call()". (Ted, 2011 Mar 17)
-In command line window ":close" doesn't work properly. (Tony Mechelynck, 2009
-Jun 1)
-
Cannot use getchar() inside :normal and using an expression mapping. Is this
supposed to work? (XyX, 2010 Sep 22)
@@ -585,9 +587,6 @@ Ignore window options when not in the right window?
Perhaps we need to use a hidden window for applying autocommands to a buffer
that doesn't have a window.
-When "b" is a symlink to directory "a", resolve("b/") doesn't result in "a/".
-(ZyX, 2011 Feb 12)
-
When using "ab foo bar" and mapping <Tab> to <Esc>, pressing <Tab> after foo
doesn't trigger the abbreviation like <Esc> would. (Ramana Kumar, 2009 Sep 6)
@@ -1001,6 +1000,9 @@ Jun 3)
However, for backwards compatibility escaping might be necessary. Check if
the user put quotes around the expanded item?
+A throw in a function causes missing an endif below the call. (Spiros
+Bousbouras, 2011 May 16)
+
Error E324 can be given when a cron script has wiped out our temp directory.
Give a clear error message about this (and tell them not to wipe out /tmp).
@@ -1020,10 +1022,19 @@ go to Insert mode and add a few lines. Then backspacing every other time
moves the cursor instead of deleting. (Chris Kaiser, 2007 Sep 25)
Patch to use Modern UI 2.0 for the Nsis installer. (Guopeng Wen, 2010 Jul 30)
+Latest version: 2011 May 18
8 Windows install with NSIS: make it possible to do a silent install, see
http://nsis.sourceforge.net/Docs/Chapter4.html#4.12
Version from Guopeng Wen that does this (2010 Dec 27)
+Windows installer: licence text should not use indent, causes bad word wrap.
+(Benjamin Fritz, 2010 Aug 16)
+
+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*
+
Changes for Win32 makefile. (Mike Williams, 2007 Jan 22, Alexei Alexandrov,
2007 Feb 8)
@@ -1857,7 +1868,7 @@ GUI:
8 When translating menus ignore the part after the Tab, the shortcut. So
that the same menu item with a different shortcut (e.g., for the Mac) are
still translated.
-8 Add menu separators for Amiga, RISCOS.
+8 Add menu separators for Amiga.
8 Add way to specify the file filter for the browse dialog. At least for
browse().
8 Add dialog for search/replace to other GUIs? Tk has something for this,
@@ -2102,8 +2113,6 @@ Macintosh:
6 Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
8 Command line completion: buffers "foo.txt" and "../b/foo.txt", completing
":buf foo<Tab>" doesn't find the second one. (George V. Reilly)
-7 Output for ":scriptnames" and ":breaklist" should shorten the file names:
- use "~/" when possible.
7 mb_off2cells() doesn't work correctly on the tail byte of a double-byte
character. (Yasuhiro Matsumoto) It should return 1 when used on a tail
byte, like for utf-8. Store second byte of double-byte in ScreenLines2[]
@@ -2130,8 +2139,6 @@ Macintosh:
works.
8 A very long message in confirm() can't be quit. Make this possible with
CTRL-C.
-8 When the clipboard isn't supported: ":yank*" gives a confusing error
- message. Specifically mention that the register name is invalid.
8 "gf" always excludes trailing punctuation characters. file_name_in_line()
is currently fixed to use ".,:;!". Add an option to make this
configurable?
@@ -2145,8 +2152,6 @@ Macintosh:
is a multi-byte character.
8 When appending to a file and 'patchmode' isn't empty, a backup file is
always written, even when the original file already exists.
-7 When using "daw" on the last word in a file and this is a single letter,
- nothing is deleted. Should delete the letter and preceding white space.
9 When getting focus while writing a large file, could warn for this file
being changed outside of Vim. Avoid checking this while the file is being
written.
@@ -2797,7 +2802,7 @@ Multi-byte characters:
For Windows, the charset_pairs[] table could be used. But how do we know
if a font exists?
- Do keyboard conversion from 'termencoding' to 'encoding' with
- convert_input() for Mac GUI and RiscOS GUI.
+ convert_input() for Mac GUI.
- Add mnemonics from RFC1345 longer than two characters.
Support CTRL-K _{mnemonic}_
7 In "-- INSERT (lang) --" show the name of the keymap used instead of
@@ -3060,6 +3065,10 @@ Built-in script language:
Patch by Ilya Sher, 2004 Mar 4.
Return a list instead.
char2hex() convert char string to hex string.
+ crypt() encrypt string
+ decrypt() decrypt string
+ base64enc() base 64 encoding
+ base64dec() base 64 decoding
attributes() return file protection flags "drwxrwxrwx"
filecopy(from, to) Copy a file
shorten(fname) shorten a file name, like home_replace()
@@ -3441,7 +3450,7 @@ Win32 GUI:
GUI:
-8 Make inputdialog() work for Photon, Amiga, RiscOS.
+8 Make inputdialog() work for Photon, Amiga.
- <C--> cannot be mapped. Should be possible to recognize this as a
normal "-" with the Ctrl modifier.
7 Implement ":popup" for other systems than Windows.
@@ -3552,9 +3561,9 @@ Autocommands:
handled (e.g., other font) (Ron Aaron)
7 When trying to open a directory, trigger an OpenDirectory event.
7 Add file type in front of file pattern: <d> for directory, <l> for link,
- <x> for executable, etc. <&xxx> for Risc OS. With commas to separate
- alternatives. The autocommand is only executed when both the file type
- AND the file pattern match. (Leonard)
+ <x> for executable, etc. With commas to separate alternatives. The
+ autocommand is only executed when both the file type AND the file pattern
+ match. (Leonard)
5 Add option that specifies extensions which are to be discarded from the
file name. E.g. 'ausuffix', with ".gz,.orig". Such that file.c.gz will
trigger the "*.c" autocommands. (Belabas)
@@ -3812,12 +3821,6 @@ Insert mode:
'cindent', 'smartindent':
-9 ") :" confuses continuation line: (Colin Bennett, 2007 Dec 14)
- cout << "a"
- << ") :"
- << "y";
-9 "} else" causes following lines to be indented too much. (Rouben
- Rostamian, 2008 Aug 30)
9 Wrapping a variable initialization should have extra indent:
char * veryLongName =
"very long string"
View
4 runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2011 Apr 28
+" Last Change: 2011 May 19
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -556,7 +556,7 @@ au BufNewFile,BufRead */etc/apt/sources.list.d/*.list setf debsources
au BufNewFile,BufRead denyhosts.conf setf denyhosts
" dnsmasq(8) configuration files
-au BufNewFile,BufRead dnsmasq.conf setf dnsmasq
+au BufNewFile,BufRead */etc/dnsmasq.conf setf dnsmasq
" ROCKLinux package description
au BufNewFile,BufRead *.desc setf desc
View
11 runtime/ftplugin/changelog.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: generic Changelog file
" Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2010-08-17
+" Latest Revision: 2011-05-02
" Variables:
" g:changelog_timeformat (deprecated: use g:changelog_dateformat instead) -
" description: the timeformat used in ChangeLog entries.
@@ -99,8 +99,9 @@ if &filetype == 'changelog'
function! s:try_reading_file(path)
try
return readfile(a:path)
+ catch
+ return []
endtry
- return []
endfunction
function! s:passwd_field(line, field)
@@ -170,7 +171,7 @@ if &filetype == 'changelog'
endfunction
" Internal function to create a new entry in the ChangeLog.
- function! s:new_changelog_entry(...)
+ function! s:new_changelog_entry()
" Deal with 'paste' option.
let save_paste = &paste
let &paste = 1
@@ -178,7 +179,7 @@ if &filetype == 'changelog'
" Look for an entry for today by our user.
let date = strftime(g:changelog_dateformat)
let search = s:substitute_items(g:changelog_date_entry_search, date,
- \ g:changelog_username)
+ \ s:username())
if search(search) > 0
" Ok, now we look for the end of the date entry, and add an entry.
call cursor(nextnonblank(line('.') + 1), 1)
@@ -197,7 +198,7 @@ if &filetype == 'changelog'
" No entry today, so create a date-user header and insert an entry.
let todays_entry = s:substitute_items(g:changelog_new_date_format,
- \ date, g:changelog_username)
+ \ date, s:username())
" Make sure we have a cursor positioning.
if stridx(todays_entry, '{cursor}') == -1
let todays_entry = todays_entry . '{cursor}'
View
109 runtime/syntax/dnsmasq.vim
@@ -1,13 +1,20 @@
" Vim syntax file
" Language: dnsmasq(8) configuration file
" Maintainer: Thilo Six <T.Six@gmx.de>
-" Last Change: 2011 Apr 28
+" Last Change: 17 May 2011
" Credits: This file is a mix of cfg.vim, wget.vim and xf86conf.vim, credits go to:
" Igor N. Prischepoff
" Doug Kearns
" David Ne\v{c}as
"
-" Options: let dnsmasq_backrgound_light = 1
+" Options: You might want to add this to your vimrc:
+"
+" if &background == "dark"
+" " dnsmasq.vim
+" let dnsmasq_backrgound_light = 0
+" else
+" let dnsmasq_backrgound_light = 1
+" endif
"
" For version 5.x: Clear all syntax items
@@ -18,6 +25,7 @@ elseif exists ("b:current_syntax")
finish
endif
+
if !exists("b:dnsmasq_backrgound_light")
if exists("dnsmasq_backrgound_light")
let b:dnsmasq_backrgound_light = dnsmasq_backrgound_light
@@ -30,75 +38,136 @@ endif
" case on
syn case match
-"Parameters
-syn match DnsmasqParams "^.\{-}="me=e-1 contains=DnsmasqComment
-"... and their values (don't want to highlight '=' sign)
syn match DnsmasqValues "=.*"hs=s+1 contains=DnsmasqComment,DnsmasqSpecial
+syn match DnsmasqSpecial display '=\|@\|,\|!\|:' nextgroup=DnsmasqValues
+syn match DnsmasqSpecial "#"
-"...because we do it here.
-syn match DnsmasqEq display '=\|@\|/\|,' nextgroup=DnsmasqValues
+syn match DnsmasqIPv4 "\(\d\{1,3}\.\)\{3}\d\{1,3}" nextgroup=DnsmasqSubnet2,DnsmasqRange
+syn match DnsmasqSubnet "\<255.\(\d\{1,3}\.\)\{2}\d\{1,3}"
+syn match DnsmasqSubnet2 contained "\/\(\d\{1,2}\)\>"
+syn match DnsmasqRange contained "-"
+syn match DnsmasqMac "\<\(\x\x\?:\)\{5}\x\x\?"
-syn match DnsmasqSpecial "#"
+syn match DnsmasqTime "\<\(\d\{1,3}\)[hm]\>"
" String
-syn match DnsmasqString "\".*\""
-syn match DnsmasqString "'.*'"
+syn match DnsmasqString "\".*\""
+syn match DnsmasqString "'.*'"
" Comments
-syn match DnsmasqComment "^#.*$" contains=DnsmasqTodo
-syn match DnsmasqComment "[ \t]#.*$" contains=DnsmasqTodo
+syn match DnsmasqComment "^#.*$" contains=DnsmasqTodo
+syn match DnsmasqComment "\s#.*$" contains=DnsmasqTodo
syn keyword DnsmasqTodo FIXME TODO XXX NOT contained
+syn match DnsmasqKeywordSpecial "\<set\>:"me=e-1
+syn match DnsmasqKeywordSpecial "\<tag\>:"me=e-1
+syn match DnsmasqKeywordSpecial ",\<static\>"hs=s+1 contains=DnsmasqSpecial
+syn match DnsmasqKeywordSpecial ",\<infinite\>"hs=s+1 contains=DnsmasqSpecial
+syn match DnsmasqKeywordSpecial "\<encap\>:"me=e-1
+syn match DnsmasqKeywordSpecial "\<net\>:"me=e-1
+syn match DnsmasqKeywordSpecial "\<vendor\>:"me=e-1
+syn match DnsmasqKeywordSpecial "\<option\>:"me=e-1
+syn match DnsmasqKeywordSpecial ",\<ignore\>"hs=s+1 contains=DnsmasqSpecial
+syn match DnsmasqKeywordSpecial "\<id\>:"me=e-1
+
syn match DnsmasqKeyword "^\s*add-mac\>"
+syn match DnsmasqKeyword "^\s*addn-hosts\>"
+syn match DnsmasqKeyword "^\s*address\>"
+syn match DnsmasqKeyword "^\s*alias\>"
syn match DnsmasqKeyword "^\s*all-servers\>"
syn match DnsmasqKeyword "^\s*bind-interfaces\>"
+syn match DnsmasqKeyword "^\s*bogus-nxdomain\>"
syn match DnsmasqKeyword "^\s*bogus-priv\>"
+syn match DnsmasqKeyword "^\s*cache-size\>"
syn match DnsmasqKeyword "^\s*clear-on-reload\>"
+syn match DnsmasqKeyword "^\s*cname\>"
+syn match DnsmasqKeyword "^\s*conf-dir\>"
+syn match DnsmasqKeyword "^\s*conf-file\>"
syn match DnsmasqKeyword "^\s*dhcp-authoritative\>"
+syn match DnsmasqKeyword "^\s*dhcp-boot\>"
syn match DnsmasqKeyword "^\s*dhcp-fqdn\>"
+syn match DnsmasqKeyword "^\s*dhcp-host\>"
+syn match DnsmasqKeyword "^\s*dhcp-ignore\>"
+syn match DnsmasqKeyword "^\s*dhcp-lease-max\>"
+syn match DnsmasqKeyword "^\s*dhcp-leasefile\>"
+syn match DnsmasqKeyword "^\s*dhcp-mac\>"
+syn match DnsmasqKeyword "^\s*dhcp-match\>"
syn match DnsmasqKeyword "^\s*dhcp-no-override\>"
+syn match DnsmasqKeyword "^\s*dhcp-option-force\>"
+syn match DnsmasqKeyword "^\s*dhcp-option\>"
+syn match DnsmasqKeyword "^\s*dhcp-range\>"
+syn match DnsmasqKeyword "^\s*dhcp-script\>"
syn match DnsmasqKeyword "^\s*dhcp-scriptuser\>"
+syn match DnsmasqKeyword "^\s*dhcp-userclass\>"
+syn match DnsmasqKeyword "^\s*dhcp-vendorclass\>"
syn match DnsmasqKeyword "^\s*domain-needed\>"
+syn match DnsmasqKeyword "^\s*domain\>"
syn match DnsmasqKeyword "^\s*enable-dbus\>"
syn match DnsmasqKeyword "^\s*enable-tftp\>"
+syn match DnsmasqKeyword "^\s*except-interface\>"
syn match DnsmasqKeyword "^\s*expand-hosts\>"
syn match DnsmasqKeyword "^\s*filterwin2k\>"
+syn match DnsmasqKeyword "^\s*group\>"
+syn match DnsmasqKeyword "^\s*interface\>"
syn match DnsmasqKeyword "^\s*keep-in-foreground\>"
syn match DnsmasqKeyword "^\s*leasefile-ro\>"
+syn match DnsmasqKeyword "^\s*listen-address\>"
+syn match DnsmasqKeyword "^\s*local-ttl\>"
+syn match DnsmasqKeyword "^\s*local\>"
syn match DnsmasqKeyword "^\s*localise-queries\>"
syn match DnsmasqKeyword "^\s*localmx\>"
syn match DnsmasqKeyword "^\s*log-dhcp\>"
syn match DnsmasqKeyword "^\s*log-queries\>"
+syn match DnsmasqKeyword "^\s*mx-host\>"
+syn match DnsmasqKeyword "^\s*mx-target\>"
syn match DnsmasqKeyword "^\s*no-daemon\>"
+syn match DnsmasqKeyword "^\s*no-dhcp-interface\>"
syn match DnsmasqKeyword "^\s*no-hosts\>"
syn match DnsmasqKeyword "^\s*no-negcache\>"
syn match DnsmasqKeyword "^\s*no-ping\>"
syn match DnsmasqKeyword "^\s*no-poll\>"
syn match DnsmasqKeyword "^\s*no-resolv\>"
syn match DnsmasqKeyword "^\s*proxy-dnssec\>"
+syn match DnsmasqKeyword "^\s*ptr-record\>"
+syn match DnsmasqKeyword "^\s*pxe-prompt\>"
+syn match DnsmasqKeyword "^\s*pxe-service\>"
syn match DnsmasqKeyword "^\s*read-ethers\>"
syn match DnsmasqKeyword "^\s*rebind-localhost-ok\>"
+syn match DnsmasqKeyword "^\s*resolv-file\>"
syn match DnsmasqKeyword "^\s*selfmx\>"
+syn match DnsmasqKeyword "^\s*server\>"
+syn match DnsmasqKeyword "^\s*srv-host\>"
syn match DnsmasqKeyword "^\s*stop-dns-rebind\>"
syn match DnsmasqKeyword "^\s*strict-order\>"
syn match DnsmasqKeyword "^\s*tftp-no-blocksize\>"
+syn match DnsmasqKeyword "^\s*tftp-root\>"
syn match DnsmasqKeyword "^\s*tftp-secure\>"
syn match DnsmasqKeyword "^\s*tftp-unique-root\>"
+syn match DnsmasqKeyword "^\s*txt-record\>"
+syn match DnsmasqKeyword "^\s*user\>"
if b:dnsmasq_backrgound_light == 1
- hi def DnsmasqParams ctermfg=DarkGreen guifg=DarkGreen
- hi def DnsmasqKeyword ctermfg=DarkGreen guifg=DarkGreen
+ hi def DnsmasqParams ctermfg=DarkGreen guifg=DarkGreen
+ hi def DnsmasqKeyword ctermfg=DarkGreen guifg=DarkGreen
else
hi def link DnsmasqKeyword Keyword
hi def link DnsmasqParams Keyword
endif
-hi def link DnsmasqTodo Todo
-hi def link DnsmasqSpecial Constant
-hi def link DnsmasqComment Comment
-hi def link DnsmasqString Constant
-hi def link DnsmasqValues Normal
-hi def link DnsmasqEq Constant
+hi def link DnsmasqKeywordSpecial Type
+hi def link DnsmasqTodo Todo
+hi def link DnsmasqSpecial Constant
+hi def link DnsmasqIPv4 Identifier
+hi def link DnsmasqSubnet2 DnsmasqSubnet
+hi def link DnsmasqSubnet DnsmasqMac
+hi def link DnsmasqRange DnsmasqMac
+hi def link DnsmasqMac Preproc
+hi def link DnsmasqTime Preproc
+hi def link DnsmasqComment Comment
+hi def link DnsmasqString Constant
+hi def link DnsmasqValues Normal
+
let b:current_syntax = "dnsmasq"
+
View
8 runtime/syntax/dot.vim
@@ -3,7 +3,7 @@
" Filenames: *.dot
" Maintainer: Markus Mottl <markus.mottl@gmail.com>
" URL: http://www.ocaml.info/vim/syntax/dot.vim
-" Last Change: 2006 Feb 05
+" Last Change: 2011 May 17 - improved identifier matching + two new keywords
" 2001 May 04 - initial version
" For version 5.x: Clear all syntax items
@@ -47,10 +47,10 @@ syn keyword dotType shape shapefile sides skew width
" Edge attributes
syn keyword dotType arrowhead arrowsize arrowtail constraint decorateP
-syn keyword dotType dir headclip headlabel labelangle labeldistance
+syn keyword dotType dir headclip headlabel headport labelangle labeldistance
syn keyword dotType labelfontcolor labelfontname labelfontsize
syn keyword dotType minlen port_label_distance samehead sametail
-syn keyword dotType tailclip taillabel weight
+syn keyword dotType tailclip taillabel tailport weight
" Shared attributes (graphs, nodes, edges)
syn keyword dotType color
@@ -67,7 +67,7 @@ syn match dotKeyChar ";"
syn match dotKeyChar "->"
" Identifier
-syn match dotIdentifier /\<\w\+\>/
+syn match dotIdentifier /\<\w\+\(:\w\+\)\?\>/
" Synchronization
syn sync minlines=50
View
21 runtime/syntax/gnash.vim
@@ -2,7 +2,7 @@
" Language: gnash(1) configuration files
" http://www.gnu.org/software/gnash/manual/gnashuser.html#gnashrc
" Maintainer: Thilo Six <T.Six@gmx.de>
-" Last Change: 2011 Apr 28
+" Last Change: 17 May 2011
" Credidts: derived from readline.vim
" Nikolai Weibull
"
@@ -15,16 +15,12 @@ elseif exists ("b:current_syntax")
finish
endif
-let s:cpo_save = &cpo
-set cpo&vim
-
-
syn case match
-
syn keyword GnashTodo contained TODO FIXME XXX NOTE
-syn region GnashComment display oneline start='^\s*#' end='$'
- \ contains=GnashTodo,@Spell
+" Comments
+syn match GnashComment "^#.*$" contains=GnashTodo
+syn match GnashComment "\s#.*$" contains=GnashTodo
syn match GnashNumber display '\<\d\+\>'
@@ -84,16 +80,13 @@ syn match GnashKeyword '\<webcamDevice\>'
syn match GnashKeyword '\<whitelist\>'
syn match GnashKeyword '\<writelog\>'
-hi def GnashOn ctermfg=Green guifg=Green
-hi def GnashOff ctermfg=Red guifg=Red
+hi def link GnashOn Identifier
+hi def link GnashOff Preproc
hi def link GnashComment Comment
hi def link GnashTodo Todo
hi def link GnashString String
-hi def link GnashNumber Normal
+hi def link GnashNumber Type
hi def link GnashSet String
hi def link GnashKeyword Keyword
let b:current_syntax = "gnash"
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
View
27 runtime/syntax/hostsaccess.vim
@@ -0,0 +1,27 @@
+" Vim syntax file
+" Language: hosts.deny, hosts.allow configuration files
+" Maintainer: Thilo Six <T.Six@gmx.de>
+" Last Change: 2011 May 01
+" Derived From: conf.vim
+" Credits: Bram Moolenaar
+"
+" This file is there to get at least a minimal highlighting.
+" A later version may be improved.
+
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+ finish
+endif
+
+" For a starter we just use conf.vim for highlighting
+if version < 600
+ so <sfile>:p:h/conf.vim
+else
+ runtime! syntax/conf.vim
+ unlet b:current_syntax
+endif
+
+
+let b:current_syntax = "hostsaccess"
+" vim: ts=8 sw=2
View
38 runtime/syntax/ocaml.vim
@@ -5,9 +5,9 @@
" Karl-Heinz Sylla <Karl-Heinz.Sylla@gmd.de>
" Issac Trotts <ijtrotts@ucdavis.edu>
" URL: http://www.ocaml.info/vim/syntax/ocaml.vim
-" Last Change: 2007 Apr 13 - Added highlighting of nativeints (MM)
-" 2006 Oct 09 - More highlighting improvements to numbers (MM)
-" 2006 Sep 19 - Improved highlighting of numbers (Florent Monnier)
+" Last Change: 2010 Oct 11 - Added highlighting of lnot (MM, thanks to Erick Matsen)
+" 2010 Sep 03 - Fixed escaping bug (MM, thanks to Florent Monnier)
+" 2010 Aug 07 - Fixed module type bug (MM)
" A minor patch was applied to the official version so that object/end
" can be distinguished from begin/end, which is used for indentation,
@@ -24,14 +24,14 @@ endif
" OCaml is case sensitive.
syn case match
+" Access to the method of an object
+syn match ocamlMethod "#"
+
" Script headers highlighted like comments
syn match ocamlComment "^#!.*"
" Scripting directives
-syn match ocamlScript "^#\<\(quit\|labels\|warnings\|directory\|cd\|load\|use\|install_printer\|remove_printer\|require\|thread\|trace\|untrace\|untrace_all\|print_depth\|print_length\)\>"
-
-" Script headers highlighted like comments
-syn match ocamlComment "^#!.*"
+syn match ocamlScript "^#\<\(quit\|labels\|warnings\|directory\|cd\|load\|use\|install_printer\|remove_printer\|require\|thread\|trace\|untrace\|untrace_all\|print_depth\|print_length\|camlp4o\)\>"
" lowercase identifier - the standard way to match
syn match ocamlLCIdentifier /\<\(\l\|_\)\(\w\|'\)*\>/
@@ -69,7 +69,7 @@ syn cluster ocamlAllErrs contains=ocamlBraceErr,ocamlBrackErr,ocamlParenErr,oca
syn cluster ocamlAENoParen contains=ocamlBraceErr,ocamlBrackErr,ocamlCommentErr,ocamlCountErr,ocamlDoErr,ocamlDoneErr,ocamlEndErr,ocamlThenErr
-syn cluster ocamlContained contains=ocamlTodo,ocamlPreDef,ocamlModParam,ocamlModParam1,ocamlPreMPRestr,ocamlMPRestr,ocamlMPRestr1,ocamlMPRestr2,ocamlMPRestr3,ocamlModRHS,ocamlFuncWith,ocamlFuncStruct,ocamlModTypeRestr,ocamlModTRWith,ocamlWith,ocamlWithRest,ocamlModType,ocamlFullMod
+syn cluster ocamlContained contains=ocamlTodo,ocamlPreDef,ocamlModParam,ocamlModParam1,ocamlPreMPRestr,ocamlMPRestr,ocamlMPRestr1,ocamlMPRestr2,ocamlMPRestr3,ocamlModRHS,ocamlFuncWith,ocamlFuncStruct,ocamlModTypeRestr,ocamlModTRWith,ocamlWith,ocamlWithRest,ocamlModType,ocamlFullMod,ocamlVal
" Enclosing delimiters
@@ -109,9 +109,6 @@ syn region ocamlNone matchgroup=ocamlKeyword start="\<if\>" matchgroup=ocamlKe
"" Modules
-" "struct"
-syn region ocamlStruct matchgroup=ocamlModule start="\<struct\>" matchgroup=ocamlModule end="\<end\>" contains=ALLBUT,@ocamlContained,ocamlEndErr
-
" "sig"
syn region ocamlSig matchgroup=ocamlModule start="\<sig\>" matchgroup=ocamlModule end="\<end\>" contains=ALLBUT,@ocamlContained,ocamlEndErr,ocamlModule
syn region ocamlModSpec matchgroup=ocamlKeyword start="\<module\>" matchgroup=ocamlModule end="\<\u\(\w\|'\)*\>" contained contains=@ocamlAllErrs,ocamlComment skipwhite skipempty nextgroup=ocamlModTRWith,ocamlMPRestr
@@ -124,8 +121,8 @@ syn match ocamlKeyword "\<include\>" skipwhite skipempty nextgroup=ocamlModPa
" "module" - somewhat complicated stuff ;-)
syn region ocamlModule matchgroup=ocamlKeyword start="\<module\>" matchgroup=ocamlModule end="\<\u\(\w\|'\)*\>" contains=@ocamlAllErrs,ocamlComment skipwhite skipempty nextgroup=ocamlPreDef
-syn region ocamlPreDef start="."me=e-1 matchgroup=ocamlKeyword end="\l\|="me=e-1 contained contains=@ocamlAllErrs,ocamlComment,ocamlModParam,ocamlModTypeRestr,ocamlModTRWith nextgroup=ocamlModPreRHS
-syn region ocamlModParam start="([^*]" end=")" contained contains=@ocamlAENoParen,ocamlModParam1
+syn region ocamlPreDef start="."me=e-1 matchgroup=ocamlKeyword end="\l\|=\|)"me=e-1 contained contains=@ocamlAllErrs,ocamlComment,ocamlModParam,ocamlModTypeRestr,ocamlModTRWith nextgroup=ocamlModPreRHS
+syn region ocamlModParam start="([^*]" end=")" contained contains=@ocamlAENoParen,ocamlModParam1,ocamlVal
syn match ocamlModParam1 "\<\u\(\w\|'\)*\>" contained skipwhite skipempty nextgroup=ocamlPreMPRestr
syn region ocamlPreMPRestr start="."me=e-1 end=")"me=e-1 contained contains=@ocamlAllErrs,ocamlComment,ocamlMPRestr,ocamlModTypeRestr
@@ -135,6 +132,8 @@ syn region ocamlMPRestr1 matchgroup=ocamlModule start="\ssig\s\=" matchgroup=o
syn region ocamlMPRestr2 start="\sfunctor\(\s\|(\)\="me=e-1 matchgroup=ocamlKeyword end="->" contained contains=@ocamlAllErrs,ocamlComment,ocamlModParam skipwhite skipempty nextgroup=ocamlFuncWith,ocamlMPRestr2
syn match ocamlMPRestr3 "\w\(\w\|'\)*\(\.\w\(\w\|'\)*\)*" contained
syn match ocamlModPreRHS "=" contained skipwhite skipempty nextgroup=ocamlModParam,ocamlFullMod
+syn keyword ocamlKeyword val
+syn region ocamlVal matchgroup=ocamlKeyword start="\<val\>" matchgroup=ocamlLCIdentifier end="\<\l\(\w\|'\)*\>" contains=@ocamlAllErrs,ocamlComment skipwhite skipempty nextgroup=ocamlMPRestr
syn region ocamlModRHS start="." end=".\w\|([^*]"me=e-2 contained contains=ocamlComment skipwhite skipempty nextgroup=ocamlModParam,ocamlFullMod
syn match ocamlFullMod "\<\u\(\w\|'\)*\(\.\u\(\w\|'\)*\)*" contained skipwhite skipempty nextgroup=ocamlFuncWith
@@ -146,8 +145,11 @@ syn region ocamlModTRWith start=":\s*("hs=s+1 end=")" contained contains=@ocam
syn match ocamlWith "\<\(\u\(\w\|'\)*\.\)*\w\(\w\|'\)*\>" contained skipwhite skipempty nextgroup=ocamlWithRest
syn region ocamlWithRest start="[^)]" end=")"me=e-1 contained contains=ALLBUT,@ocamlContained
+" "struct"
+syn region ocamlStruct matchgroup=ocamlModule start="\<\(module\s\+\)\=struct\>" matchgroup=ocamlModule end="\<end\>" contains=ALLBUT,@ocamlContained,ocamlEndErr
+
" "module type"
-syn region ocamlKeyword start="\<module\>\s*\<type\>" matchgroup=ocamlModule end="\<\w\(\w\|'\)*\>" contains=ocamlComment skipwhite skipempty nextgroup=ocamlMTDef
+syn region ocamlKeyword start="\<module\>\s*\<type\>\(\s*\<of\>\)\=" matchgroup=ocamlModule end="\<\w\(\w\|'\)*\>" contains=ocamlComment skipwhite skipempty nextgroup=ocamlMTDef
syn match ocamlMTDef "=\s*\w\(\w\|'\)*\>"hs=s+1,me=s
syn keyword ocamlKeyword and as assert class
@@ -159,7 +161,7 @@ syn keyword ocamlKeyword land lazy let match
syn keyword ocamlKeyword method mutable new of
syn keyword ocamlKeyword parser private raise rec
syn keyword ocamlKeyword try type
-syn keyword ocamlKeyword val virtual when while with
+syn keyword ocamlKeyword virtual when while with
if exists("ocaml_revised")
syn keyword ocamlKeyword do value
@@ -174,7 +176,7 @@ syn keyword ocamlType array bool char exn float format format4
syn keyword ocamlType int int32 int64 lazy_t list nativeint option
syn keyword ocamlType string unit
-syn keyword ocamlOperator asr lor lsl lsr lxor mod not
+syn keyword ocamlOperator asr lnot lor lsl lsr lxor mod not
syn match ocamlConstructor "(\s*)"
syn match ocamlConstructor "\[\s*\]"
@@ -189,6 +191,7 @@ syn match ocamlConstructor "`\w\(\w\|'\)*\>"
syn match ocamlModPath "\u\(\w\|'\)*\."he=e-1
syn match ocamlCharacter "'\\\d\d\d'\|'\\[\'ntbr]'\|'.'"
+syn match ocamlCharacter "'\\x\x\x'"
syn match ocamlCharErr "'\\\d\d'\|'\\\d'"
syn match ocamlCharErr "'\\[^\'ntbr]'"
syn region ocamlString start=+"+ skip=+\\\\\|\\"+ end=+"+
@@ -220,7 +223,7 @@ syn match ocamlNumber "\<-\=\d\(_\|\d\)*[l|L|n]\?\>"
syn match ocamlNumber "\<-\=0[x|X]\(\x\|_\)\+[l|L|n]\?\>"
syn match ocamlNumber "\<-\=0[o|O]\(\o\|_\)\+[l|L|n]\?\>"
syn match ocamlNumber "\<-\=0[b|B]\([01]\|_\)\+[l|L|n]\?\>"
-syn match ocamlFloat "\<-\=\d\(_\|\d\)*\.\(_\|\d\)*\([eE][-+]\=\d\(_\|\d\)*\)\=\>"
+syn match ocamlFloat "\<-\=\d\(_\|\d\)*\.\?\(_\|\d\)*\([eE][-+]\=\d\(_\|\d\)*\)\=\>"
" Labels
syn match ocamlLabel "\~\(\l\|_\)\(\w\|'\)*"lc=1
@@ -294,6 +297,7 @@ if version >= 508 || !exists("did_ocaml_syntax_inits")
HiLink ocamlConstructor Constant
+ HiLink ocamlVal Keyword
HiLink ocamlModPreRHS Keyword
HiLink ocamlMPRestr2 Keyword
HiLink ocamlKeyword Keyword
View
536 runtime/syntax/pfmain.vim
@@ -1,10 +1,11 @@
" Vim syntax file
" Language: Postfix main.cf configuration
" Maintainer: KELEMEN Peter <Peter dot Kelemen at cern dot ch>
-" Last Change: 2006 Apr 15
-" Version: 0.20
+" Last Update: Hong Xu
+" Last Change: 2011 May 14
+" Version: 0.40
" URL: http://cern.ch/fuji/vim/syntax/pfmain.vim
-" Comment: Based on Postfix 2.3.x defaults.
+" Comment: Based on Postfix 2.9 defaults.
if version < 600
syntax clear