averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vim'

Browse Source 
Conflicts:
	src/ex_getln.c
	src/gui.c
	src/gui.h
	src/vim.h
This commit is contained in:
Bjorn Winckler
2011-05-30 21:42:28 +02:00
parent 42402338c1 2bdcd40dc1
commit c60f09b824
111 changed files with 2379 additions and 7077 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.hgtags
+29
View File
@@ -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
Filelist
-7
View File
@@ -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 \
README_extra.txt
-3
View File
@@ -13,9 +13,6 @@ src/if_sniff.* Interface to SNiFF. If you don't know what SNiFF is,
src/os_amiga.* Files for the Amiga port.
src/gui_riscos.*
src/os_riscos.* Files for the RISC OS port.
src/gui_beos.*
src/os_beos.* Files for the BeOS port.
runtime/doc/autocmd.txt
+13
View File
@@ -299,6 +299,8 @@ Name triggered by ~
|InsertEnter| starting Insert mode
|InsertChange| when typing <Insert> while in Insert or Replace mode
|InsertLeave| when leaving Insert mode
|InsertCharPre| when a character was typed in Insert mode, before
inserting it
|ColorScheme| after loading a color scheme
@@ -657,6 +659,17 @@ InsertChange When typing <Insert> while in Insert or
indicates the new mode.
Be careful not to move the cursor or do
anything else that the user does not expect.
*InsertCharPre*
InsertCharPre When a character is typed in Insert mode,
before inserting the char.
The |v:char| variable indicates the char typed
and can be changed during the event to insert
a different character. When |v:char| is set
to more than one character this text is
inserted literally.
It is not allowed to change the text |textlock|.
The event is not triggered when 'paste' is
set.
*InsertEnter*
InsertEnter Just before starting Insert mode. Also for
Replace mode and Virtual Replace mode. The
runtime/doc/change.txt
+21 -18
View File
@@ -1,4 +1,4 @@
*change.txt* For Vim version 7.3. Last change: 2011 Feb 25
*change.txt* For Vim version 7.3. Last change: 2011 May 17
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -522,11 +522,11 @@ comment (starting with '"') after the ":!" command.
={motion} Filter {motion} lines through the external program
given with the 'equalprg' option. When the 'equalprg'
option is empty (this is the default), use the
internal formatting function |C-indenting|. But when
'indentexpr' is not empty, it will be used instead
|indent-expression|. When Vim was compiled without
internal formatting then the "indent" program is used
as a last resort.
internal formatting function |C-indenting| and
|'lisp'|. But when 'indentexpr' is not empty, it will
be used instead |indent-expression|. When Vim was
compiled without internal formatting then the "indent"
program is used as a last resort.
*==*
== Filter [count] lines like with ={motion}.
@@ -919,8 +919,8 @@ inside of strings can change! Also see 'softtabstop' option. >
*:y* *:yank* *E850*
:[range]y[ank] [x] Yank [range] lines [into register x]. Yanking to the
"* or "+ registers is possible only in GUI versions or
when the |+xterm_clipboard| feature is included.
"* or "+ registers is possible only when the
|+clipboard| feature is included.
:[range]y[ank] [x] {count}
Yank {count} lines, starting with last line number
@@ -1390,16 +1390,19 @@ before typing anything else on the new line. This will replace the
middle-comment leader with the end-comment leader and apply any specified
alignment, leaving just " */". There is no need to hit BackSpace first.
When there is a match with a middle part, but there also is a maching end part
which is longer, the end part is used. This makes a C style comment work
without requiring the middle part to end with a space.
Here is an example of alignment flags at work to make a comment stand out
(kind of looks like a 1 too). Consider comment string >
sr:/***,m:**,ex2:******/
/***
**<--right aligned from "r" flag
**
offset 2 spaces from the "2" flag--->**
******/
(kind of looks like a 1 too). Consider comment string: >
:set comments=sr:/***,m:**,ex-2:******/
<
/*** ~
**<--right aligned from "r" flag ~
** ~
offset 2 spaces for the "-2" flag--->** ~
******/ ~
In this case, the first comment was typed, then return was pressed 4 times,
then "/" was pressed to end the comment.
@@ -1417,8 +1420,8 @@ Reindenting using a different method like |gq| or |=| will not consult
alignment flags either. The same behaviour can be defined in those other
formatting options. One consideration is that 'cindent' has additional options
for context based indenting of comments but cannot replicate many three piece
indent alignments. However, 'indentexpr' is has the ability to work better
with three piece comments.
indent alignments. However, 'indentexpr' has the ability to work better with
three piece comments.
Other examples: >
"b:*" Includes lines starting with "*", but not if the "*" is
runtime/doc/eval.txt
+12 -3
View File
@@ -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.
runtime/doc/fold.txt
+1 -1
View File
@@ -60,7 +60,7 @@ level form a fold, with the lines with a higher level forming a nested fold.
The nesting of folds is limited with 'foldnestmax'.
Some lines are ignored and get the fold level of the line above or below it,
whatever is the lowest. These are empty or white lines and lines starting
whichever is lower. These are empty or white lines and lines starting
with a character in 'foldignore'. White space is skipped before checking for
characters in 'foldignore'. For C use "#" to ignore preprocessor lines.
runtime/doc/if_pyth.txt
+13 -1
View File
@@ -1,4 +1,4 @@
*if_pyth.txt* For Vim version 7.3. Last change: 2010 Oct 20
*if_pyth.txt* For Vim version 7.3. Last change: 2011 May 07
VIM REFERENCE MANUAL by Paul Moore
@@ -377,6 +377,18 @@ To work around such problems there are these options:
3. You undefine PY_NO_RTLD_GLOBAL in auto/config.h after configuration. This
may crash Vim though.
*has-python*
You can test what Python version is available with: >
if has('python')
echo 'there is Pyton 2.x'
elseif has('python3')
echo 'there is Python 3.x'
endif
Note however, that when Python 2 and 3 are both available and loaded
dynamically, these has() calls will try to load them. If only one can be
loaded at a time, just checking if Python 2 or 3 are available will prevent
the other one from being available.
==============================================================================
vim:tw=78:ts=8:ft=help:norl:
runtime/doc/indent.txt
+58 -7
View File
@@ -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:
runtime/doc/intro.txt
+5 -3
View File
@@ -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
runtime/doc/map.txt
+11 -9
View File
@@ -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
runtime/doc/message.txt
+3 -3
View File
@@ -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
runtime/doc/options.txt
+11 -4
View File
@@ -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
runtime/doc/os_risc.txt
+3 -313
View File
@@ -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:
runtime/doc/os_win32.txt
+30 -1
View File
@@ -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!
runtime/doc/quickfix.txt
+13 -12
View File
@@ -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*
runtime/doc/syntax.txt
+3 -1
View File
@@ -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
runtime/doc/tags
+2
View File
@@ -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()*
runtime/doc/todo.txt
+69 -66
View File
@@ -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"
runtime/filetype.vim
+2 -2
View File
@@ -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
runtime/ftplugin/changelog.vim
+6 -5
View File
@@ -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}'
runtime/syntax/dnsmasq.vim
+89 -20
View File
@@ -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"
runtime/syntax/dot.vim
+4 -4
View File
@@ -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
runtime/syntax/gnash.vim
+7 -14
View File
@@ -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
runtime/syntax/hostsaccess.vim
+27
View File
@@ -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
runtime/syntax/ocaml.vim
+21 -17
View File
@@ -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
runtime/syntax/pfmain.vim
+533 -3
View File
File diff suppressed because it is too large Load Diff
runtime/syntax/php.vim
+13 -10
View File
@@ -1,11 +1,10 @@
" Vim syntax file
" Language: php PHP 3/4/5
" Maintainer: Peter Hodge <toomuchphp-vim@yahoo.com>
" Last Change: June 9, 2006
" URL: http://www.vim.org/scripts/script.php?script_id=1571
"
" Former Maintainer: Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
" Former URL: http://svn.debian.org/wsvn/pkg-vim/trunk/runtime/syntax/php.vim?op=file&rev=0&sc=0
" Maintainer: Jason Woofenden <jason@jasonwoof.com>
" Last Change: April 28, 2011
" URL: https://gitorious.org/jasonwoof/vim-syntax/blobs/master/php.vim
" Former Maintainers: Peter Hodge <toomuchphp-vim@yahoo.com>
" Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
"
" Note: If you are using a colour terminal with dark background, you will probably find
" the 'elflord' colorscheme is much better for PHP's syntax than the default
@@ -327,6 +326,8 @@ syn match phpFloat "\(-\=\<\d+\|-\=\)\.\d\+\>" contained display
syn match phpSpecialChar "\\[abcfnrtyv\\]" contained display
syn match phpSpecialChar "\\\d\{3}" contained contains=phpOctalError display
syn match phpSpecialChar "\\x\x\{2}" contained display
syn match phpDoubleSpecialChar "\\\"" contained display
syn match phpSingleSpecialChar "\\[\\']" contained display
" Error
syn match phpOctalError "[89]" contained display
@@ -355,13 +356,13 @@ endif
" String
if exists("php_parent_error_open")
syn region phpStringDouble matchgroup=None start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@phpAddStrings,phpIdentifier,phpSpecialChar,phpIdentifierSimply,phpIdentifierComplex contained keepend
syn region phpStringDouble matchgroup=None start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@phpAddStrings,phpIdentifier,phpSpecialChar,phpIdentifierSimply,phpIdentifierComplex,phpDoubleSpecialChar contained keepend
syn region phpBacktick matchgroup=None start=+`+ skip=+\\\\\|\\"+ end=+`+ contains=@phpAddStrings,phpIdentifier,phpSpecialChar,phpIdentifierSimply,phpIdentifierComplex contained keepend
syn region phpStringSingle matchgroup=None start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@phpAddStrings contained keepend
syn region phpStringSingle matchgroup=None start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@phpAddStrings,phpSingleSpecialChar contained keepend
else
syn region phpStringDouble matchgroup=None start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@phpAddStrings,phpIdentifier,phpSpecialChar,phpIdentifierSimply,phpIdentifierComplex contained extend keepend
syn region phpStringDouble matchgroup=None start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@phpAddStrings,phpIdentifier,phpSpecialChar,phpIdentifierSimply,phpIdentifierComplex,phpDoubleSpecialChar contained extend keepend
syn region phpBacktick matchgroup=None start=+`+ skip=+\\\\\|\\"+ end=+`+ contains=@phpAddStrings,phpIdentifier,phpSpecialChar,phpIdentifierSimply,phpIdentifierComplex contained extend keepend
syn region phpStringSingle matchgroup=None start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@phpAddStrings contained keepend extend
syn region phpStringSingle matchgroup=None start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@phpAddStrings,phpSingleSpecialChar contained keepend extend
endif
" HereDoc
@@ -613,6 +614,8 @@ if version >= 508 || !exists("did_php_syn_inits")
HiLink phpInclude Include
HiLink phpDefine Define
HiLink phpSpecialChar SpecialChar
HiLink phpDoubleSpecialChar SpecialChar
HiLink phpSingleSpecialChar SpecialChar
HiLink phpParent Delimiter
HiLink phpIdentifierConst Delimiter
HiLink phpParentError Error
runtime/syntax/readline.vim
+356 -137
View File
@@ -1,11 +1,11 @@
" Vim syntax file
" Language: readline(3) configuration file
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2009-05-25
" Latest Revision: 2011-05-02
" readline_has_bash - if defined add support for bash specific
" settings/functions
if exists("b:current_syntax")
if exists('b:current_syntax')
finish
endif
@@ -14,163 +14,382 @@ set cpo&vim
setlocal iskeyword+=-
syn keyword readlineTodo contained TODO FIXME XXX NOTE
syn match readlineKey contained
\ '\S'
\ nextgroup=readlineKeyTerminator
syn region readlineComment display oneline start='^\s*#' end='$'
\ contains=readlineTodo,@Spell
syn match readlineBegin display '^'
\ nextgroup=readlineComment,
\ readlineConditional,
\ readlineInclude,
\ readlineKeyName,
\ readlineKey,
\ readlineKeySeq,
\ readlineKeyword
\ skipwhite
syn match readlineString '^\s*[A-Za-z-]\+:'me=e-1 contains=readlineKeys
syn region readlineString display oneline start=+"+ skip=+\\\\\|\\"+
\ end=+"+ contains=readlineKeysTwo
syn region readlineComment contained display oneline
\ start='#'
\ end='$'
\ contains=readlineTodo,
\ @Spell
syn keyword readlineTodo contained
\ TODO
\ FIXME
\ XXX
\ NOTE
syn match readlineConditional contained
\ '$if\>'
\ nextgroup=readlineTest,
\ readlineTestApp
\ skipwhite
syn keyword readlineTest contained
\ mode
\ nextgroup=readlineTestModeEq
syn match readlineTestModeEq contained
\ '='
\ nextgroup=readlineEditingMode
syn keyword readlineTest contained
\ term
\ nextgroup=readlineTestTermEq
syn match readlineTestTermEq contained
\ '='
\ nextgroup=readlineTestTerm
syn match readlineTestTerm contained
\ '\S\+'
syn match readlineTestApp contained
\ '\S\+'
syn match readlineConditional contained display
\ '$\%(else\|endif\)\>'
syn match readlineInclude contained display
\ '$include\>'
\ nextgroup=readlinePath
syn match readlinePath contained display
\ '.\+'
syn case ignore
syn keyword readlineKeys contained Control Meta Del Esc Escape LFD
\ Newline Ret Return Rubout Space Spc Tab
syn match readlineKeyName contained display
\ nextgroup=readlineKeySeparator,
\ readlineKeyTerminator
\ '\%(Control\|Del\|Esc\|Escape\|LFD\|Meta\|Newline\|Ret\|Return\|Rubout\|Space\|Spc\|Tab\)'
syn case match
syn match readlineKeysTwo contained display
\ +\\\([CM]-\|[e\\"'abdfnrtv]\|\o\{3}\|x\x\{3}\)+
syn match readlineKeySeparator contained
\ '-'
\ nextgroup=readlineKeyName,
\ readlineKey
syn match readlineKeymaps contained display
\ 'emacs\(-standard\|-meta\|-ctlx\)\='
syn match readlineKeymaps contained display
\ 'vi\(-move\|-command\|-insert\)\='
syn match readlineKeyTerminator contained
\ ':'
\ nextgroup=readlineFunction
\ skipwhite
syn keyword readlineBellStyles contained audible visible none
syn region readlineKeySeq contained display oneline
\ start=+"+
\ skip=+\\\\\|\\"+
\ end=+"+
\ contains=readlineKeyEscape
\ nextgroup=readlineKeyTerminator
syn match readlineNumber contained display '\<\d\+\>'
syn match readlineKeyEscape contained display
\ +\\\([CM]-\|[e\\"'abdfnrtv]\|\o\{3}\|x\x\{2}\)+
syn keyword readlineKeyword contained
\ set
\ nextgroup=readlineVariable
\ skipwhite
syn keyword readlineVariable contained
\ nextgroup=readlineBellStyle
\ skipwhite
\ bell-style
syn keyword readlineVariable contained
\ nextgroup=readlineBoolean
\ skipwhite
\ bind-tty-special-chars
\ completion-ignore-case
\ completion-map-case
\ convert-meta
\ disable-completion
\ echo-control-characters
\ enable-keypad
\ enable-meta-key
\ expand-tilde
\ history-preserve-point
\ horizontal-scroll-mode
\ input-meta
\ meta-flag
\ mark-directories
\ mark-modified-lines
\ mark-symlinked-directories
\ match-hidden-files
\ menu-complete-display-prefix
\ output-meta
\ page-completions
\ print-completions-horizontally
\ revert-all-at-newline
\ show-all-if-ambiguous
\ show-all-if-unmodified
\ skip-completed-text
\ visible-stats
syn keyword readlineVariable contained
\ nextgroup=readlineString
\ skipwhite
\ comment-begin
\ isearch-terminators
syn keyword readlineVariable contained
\ nextgroup=readlineNumber
\ skipwhite
\ completion-display-width
\ completion-prefix-display-length
\ completion-query-items
\ history-size
syn keyword readlineVariable contained
\ nextgroup=readlineEditingMode
\ skipwhite
\ editing-mode
syn keyword readlineVariable contained
\ nextgroup=readlineKeymap
\ skipwhite
\ keymap
syn keyword readlineBellStyle contained
\ audible
\ visible
\ none
syn case ignore
syn keyword readlineBoolean contained on off
syn keyword readlineBoolean contained
\ on
\ off
syn case match
syn keyword readlineIfOps contained mode term
syn region readlineString contained display oneline
\ matchgroup=readlineStringDelimiter
\ start=+"+
\ skip=+\\\\\|\\"+
\ end=+"+
syn region readlineConditional display oneline transparent
\ matchgroup=readlineConditional
\ start='^\s*$if' end="$"
\ contains=readlineIfOps,readlineKeymaps
syn match readlineConditional display '^\s*$\(else\|endif\)\>'
syn match readlineNumber contained display
\ '[+-]\d\+\>'
syn match readlineInclude display '^\s*$include\>'
syn keyword readlineEditingMode contained
\ emacs
\ vi
syn region readlineSet display oneline transparent
\ matchgroup=readlineKeyword start='^\s*set\>'
\ end="$"me=e-1 contains=readlineNumber,
\ readlineBoolean,readlineKeymaps,
\ readlineBellStyles,readlineSettings
syn match readlineKeymap contained display
\ 'emacs\%(-\%(standard\|meta\|ctlx\)\)\=\|vi\%(-\%(move\|command\|insert\)\)\='
syn keyword readlineSettings contained bell-style comment-begin
\ completion-ignore-case completion-query-items
\ convert-meta disable-completion editing-mode
\ enable-keypad expand-tilde
\ horizontal-scroll-mode mark-directories
\ keymap mark-modified-lines meta-flag
\ input-meta output-meta
\ print-completions-horizontally
\ show-all-if-ambiguous visible-stats
\ prefer-visible-bell blink-matching-paren
\ match-hidden-files history-preserve-point
\ isearch-terminators
syn region readlineBinding display oneline transparent
\ matchgroup=readlineKeyword start=':' end='$'
\ contains=readlineKeys,readlineFunctions
syn keyword readlineFunctions contained display
\ beginning-of-line end-of-line forward-char
\ backward-char forward-word backward-word
\ clear-screen redraw-current-line
\ accept-line previous-history
\ next-history beginning-of-history
\ end-of-history reverse-search-history
\ forward-search-history
\ non-incremental-reverse-search-history
\ non-incremental-forward-search-history
\ history-search-forward
\ history-search-backward
\ yank-nth-arg yank-last-arg
\ delete-char backward-delete-char
\ forward-backward-delete-char quoted-insert
\ tab-insert self-insert transpose-chars
\ transpose-words upcase-word downcase-word
\ capitalize-word overwrite-mode kill-line
\ backward-kill-line unix-line-discard
\ kill-whole-line kill-word backward-kill-word
\ unix-word-rubout unix-filename-rubout
\ delete-horizontal-space kill-region
\ copy-region-as-kill copy-backward-word
\ copy-forward-word yank yank-pop
\ digit-argument universal-argument complete
\ possible-completions insert-completions
\ menu-complete delete-char-or-list
\ start-kbd-macro end-kbd-macro
\ call-last-kbd-macro re-read-init-file
\ abort do-uppercase-version prefix-meta
\ undo revert-line tilde-expand set-mark
\ exchange-point-and-mark character-search
\ character-search-backward insert-comment
\ dump-functions dump-variables dump-macros
\ emacs-editing-mode vi-editing-mode
\ vi-complete vi-char-search vi-redo
\ vi-search vi-arg-digit vi-append-eol
\ vi-prev-word vi-change-to vi-delete-to
\ vi-end-word vi-fetch-history vi-insert-beg
\ vi-search-again vi-put vi-replace
\ vi-subst vi-yank-to vi-first-print
\ vi-yank-arg vi-goto-mark vi-append-mode
\ vi-insertion-mode prev-history vi-set-mark
\ vi-search-again vi-put vi-change-char
\ vi-subst vi-delete vi-yank-to
\ vi-column vi-change-case vi-overstrike
\ vi-overstrike-delete do-lowercase-version
\ delete-char-or-list tty-status
\ arrow-key-prefix vi-back-to-indent vi-bword
\ vi-bWord vi-eword vi-eWord vi-fword vi-fWord
\ vi-next-word
\ vi-movement-mode
syn keyword readlineFunction contained
\ beginning-of-line
\ end-of-line
\ forward-char
\ backward-char
\ forward-word
\ backward-word
\ clear-screen
\ redraw-current-line
\
\ accept-line
\ previous-history
\ next-history
\ beginning-of-history
\ end-of-history
\ reverse-search-history
\ forward-search-history
\ non-incremental-reverse-search-history
\ non-incremental-forward-search-history
\ history-search-forward
\ history-search-backward
\ yank-nth-arg
\ yank-last-arg
\
\ delete-char
\ backward-delete-char
\ forward-backward-delete-char
\ quoted-insert
\ tab-insert
\ self-insert
\ transpose-chars
\ transpose-words
\ upcase-word
\ downcase-word
\ capitalize-word
\ overwrite-mode
\
\ kill-line
\ backward-kill-line
\ unix-line-discard
\ kill-whole-line
\ kill-word
\ backward-kill-word
\ unix-word-rubout
\ unix-filename-rubout
\ delete-horizontal-space
\ kill-region
\ copy-region-as-kill
\ copy-backward-word
\ copy-forward-word
\ yank
\ yank-pop
\
\ digit-argument
\ universal-argument
\
\ complete
\ possible-completions
\ insert-completions
\ menu-complete
\ menu-complete-or-backward
\ delete-char-or-list
\
\ start-kbd-macro
\ end-kbd-macro
\ call-last-kbd-macro
\
\ re-read-init-file
\ abort
\ do-uppercase-version
\ prefix-meta
\ undo
\ revert-line
\ tilde-expand
\ set-mark
\ exchange-point-and-mark
\ character-search
\ character-search-backward
\ skip-csi-sequence
\ insert-comment
\ dump-functions
\ dump-variables
\ dump-macros
\ emacs-editing-mode
\ vi-editing-mode
\
\ vi-eof-maybe
\ vi-movement-mode
\ vi-undo
\ vi-match
\ vi-tilde-expand
\ vi-complete
\ vi-char-search
\ vi-redo
\ vi-search
\ vi-arg-digit
\ vi-append-eol
\ vi-prev-word
\ vi-change-to
\ vi-delete-to
\ vi-end-word
\ vi-char-search
\ vi-fetch-history
\ vi-insert-beg
\ vi-search-again
\ vi-put
\ vi-replace
\ vi-subst
\ vi-char-search
\ vi-next-word
\ vi-yank-to
\ vi-first-print
\ vi-yank-arg
\ vi-goto-mark
\ vi-append-mode
\ vi-prev-word
\ vi-change-to
\ vi-delete-to
\ vi-end-word
\ vi-char-search
\ vi-insert-mode
\ vi-set-mark
\ vi-search-again
\ vi-put
\ vi-change-char
\ vi-subst
\ vi-char-search
\ vi-undo
\ vi-next-word
\ vi-delete
\ vi-yank-to
\ vi-column
\ vi-change-case
if exists("readline_has_bash")
syn keyword readlineFunctions contained
\ shell-expand-line history-expand-line
\ magic-space alias-expand-line
\ history-and-alias-expand-line
\ insert-last-argument operate-and-get-next
\ forward-backward-delete-char
\ delete-char-or-list complete-filename
\ possible-filename-completions
\ complete-username
\ possible-username-completions
\ complete-variable
\ possible-variable-completions
\ complete-hostname
\ possible-hostname-completions
\ complete-command
\ possible-command-completions
\ dynamic-complete-history
\ complete-into-braces
\ glob-expand-word glob-list-expansions
\ display-shell-version glob-complete-word
\ edit-and-execute-command
syn keyword readlineFunction contained
\ shell-expand-line
\ history-expand-line
\ magic-space
\ alias-expand-line
\ history-and-alias-expand-line
\ insert-last-argument
\ operate-and-get-next
\ forward-backward-delete-char
\ delete-char-or-list
\ complete-filename
\ possible-filename-completions
\ complete-username
\ possible-username-completions
\ complete-variable
\ possible-variable-completions
\ complete-hostname
\ possible-hostname-completions
\ complete-command
\ possible-command-completions
\ dynamic-complete-history
\ complete-into-braces
\ glob-expand-word
\ glob-list-expansions
\ display-shell-version
\ glob-complete-word
\ edit-and-execute-command
endif
hi def link readlineComment Comment
hi def link readlineTodo Todo
hi def link readlineString String
hi def link readlineKeys SpecialChar
hi def link readlineKeysTwo SpecialChar
hi def link readlineKeymaps Constant
hi def link readlineBellStyles Constant
hi def link readlineNumber Number
hi def link readlineBoolean Boolean
hi def link readlineIfOps Type
hi def link readlineConditional Conditional
hi def link readlineInclude Include
hi def link readlineKeyword Keyword
hi def link readlineSettings Type
hi def link readlineFunctions Type
hi def link readlineKey readlineKeySeq
hi def link readlineComment Comment
hi def link readlineTodo Todo
hi def link readlineConditional Conditional
hi def link readlineTest Type
hi def link readlineDelimiter Delimiter
hi def link readlineTestModeEq readlineEq
hi def link readlineTestTermEq readlineEq
hi def link readlineTestTerm readlineString
hi def link readlineTestAppEq readlineEq
hi def link readlineTestApp readlineString
hi def link readlineInclude Include
hi def link readlinePath String
hi def link readlineKeyName SpecialChar
hi def link readlineKeySeparator readlineKeySeq
hi def link readlineKeyTerminator readlineDelimiter
hi def link readlineKeySeq String
hi def link readlineKeyEscape SpecialChar
hi def link readlineKeyword Keyword
hi def link readlineVariable Identifier
hi def link readlineBellStyle Constant
hi def link readlineBoolean Boolean
hi def link readlineString String
hi def link readlineStringDelimiter readlineString
hi def link readlineNumber Number
hi def link readlineEditingMode Constant
hi def link readlineKeymap Constant
hi def link readlineFunction Function
let b:current_syntax = "readline"
let b:current_syntax = 'readline'
let &cpo = s:cpo_save
unlet s:cpo_save
runtime/syntax/sysctl.vim
+2 -2
View File
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: sysctl.conf(5) configuration file
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2006-04-19
" Latest Revision: 2011-05-02
if exists("b:current_syntax")
finish
@@ -13,7 +13,7 @@ set cpo&vim
syn match sysctlBegin display '^'
\ nextgroup=sysctlToken,sysctlComment skipwhite
syn match sysctlToken contained display '\S\+'
syn match sysctlToken contained display '[^=]\+'
\ nextgroup=sysctlTokenEq skipwhite
syn match sysctlTokenEq contained display '=' nextgroup=sysctlValue skipwhite
src/INSTALL
+4 -23
View File
@@ -6,9 +6,8 @@ executable version of Vim, you don't need this.
Contents:
1. Generic
2. Unix
3. RISC OS
4. OS/2 (with EMX 0.9b)
5. Atari MiNT
3. OS/2 (with EMX 0.9b)
4. Atari MiNT
See INSTALLami.txt for Amiga
See INSTALLmac.txt for Macintosh
@@ -174,25 +173,7 @@ And to not search for locally installed headers and libraries at all, use:
./configure --without-local-dir
3. RISC OS
=============
Much file renaming is needed before you can compile anything.
You'll need UnixLib to link against, GCC and GNU make.
I suggest you get the RISC OS binary distribution, which includes the
Templates file and the loader.
Try here: http://www.ecs.soton.ac.uk/~tal197
Do
:help riscos
within the editor for more information, or read the
../runtime/doc/os_risc.txt help file.
4. OS/2
3. OS/2
=======
Summary:
@@ -237,7 +218,7 @@ Prerequisites:
Check ../runtime/doc/os_os2.txt for additional info on running Vim.
5. Atari MiNT
4. Atari MiNT
=============
[NOTE: this is quite old, it might not work anymore]
src/Make_ro.mak
-135
View File
@@ -1,135 +0,0 @@
#
# Makefile for Vim on RISC OS - Andy Wingate
#
GCC = gcc -mthrowback
CFLAGS = -DRISCOS -DFEAT_GUI
CC = $(GCC) $(CFLAGS) -O2
# -DUP_BC_PC_EXTERN for term.c needed as BC defined in termlib.c and term.c
TERMFLAG = -DUP_BC_PC_EXTERN
ASMFLAGS = -throwback -objasm -gcc
OBJS = o.buffer o.charset o.diff o.digraph o.edit o.eval o.ex_cmds o.ex_cmds2 \
o.ex_docmd o.ex_eval o.ex_getln o.fileio o.fold o.getchar \
o.hardcopy o.hashtab o.main o.mark o.mbyte \
o.memfile o.memline o.menu o.message o.misc1 o.misc2 o.move \
o.normal o.ops o.option o.popupmnu o.quickfix o.regexp o.screen \
o.search \
o.spell o.syntax o.tag o.term o.termlib o.ui o.undo o.version \
o.window o.os_riscos o.swis o.gui o.gui_riscos
Vim: $(OBJS)
$(GCC) -o Vim $(OBJS)
install: Vim
squeeze -v Vim @.!Vim.Vim
clean:
create o.!fake! 0
wipe o.* ~cf
remove Vim
o.swis: s.swis
as $(ASMFLAGS) -o o.swis s.swis
# Rules for object files
o.%: c.%
$(CC) -c $< -o $@
o.buffer: c.buffer
o.charset: c.charset
o.digraph: c.digraph
o.diff: c.diff
o.edit: c.edit
o.eval: c.eval
o.ex_cmds: c.ex_cmds
o.ex_cmds2: c.ex_cmds2
o.ex_docmd: c.ex_docmd
o.ex_eval: c.ex_eval
o.ex_getln: c.ex_getln
o.fileio: c.fileio
o.fold: c.fold
o.getchar: c.getchar
o.hardcopy: c.hardcopy
o.hashtab: c.hashtab
o.gui: c.gui
o.gui_riscos: c.gui_riscos
o.main: c.main
o.mark: c.mark
o.mbyte: c.mbyte
o.memfile: c.memfile
o.memline: c.memline
o.menu: c.menu
o.message: c.message
o.misc1: c.misc1
o.misc2: c.misc2
o.move: c.move
o.normal: c.normal
o.ops: c.ops
o.option: c.option
o.os_riscos: c.os_riscos
o.pty: c.pty
o.popupmnu: c.popupmnu
o.quickfix: c.quickfix
o.regexp: c.regexp
o.screen: c.screen
o.search: c.search
o.spell: c.spell
o.syntax: c.syntax
o.tag: c.tag
o.term: c.term
$(CC) $(TERMFLAG) -c c.term -o o.term
o.termlib: c.termlib
o.ui: c.ui
o.undo: c.undo
o.version: c.version
o.window: c.window
src/Makefile
+2 -8
View File
@@ -29,7 +29,7 @@
# - Uncomment the line "CONF_OPT_X = --without-x" if you have X11 but
# want to disable using X11 libraries. This speeds up starting Vim,
# but the window title will not be set and the X11 selection can not
# used.
# be used.
# - Uncomment the line "CONF_OPT_XSMP = --disable-xsmp" if you have the
# X11 Session Management Protocol (XSMP) library (libSM) but do not
# want to use it.
@@ -730,12 +730,6 @@ LINT_OPTIONS = -beprxzF
### USL for Unix Systems Laboratories (SYSV 4.2)
#EXTRA_DEFS = -DUSL
### RISCos on MIPS without X11
#EXTRA_DEFS = -DMIPS
### RISCos on MIPS with X11
#EXTRA_LIBS = -lsun
### (6) A/UX 3.1.1 with gcc (Jim Jagielski)
#CC= gcc -D_POSIX_SOURCE
#CFLAGS= -O2
@@ -1649,7 +1643,7 @@ PRO_AUTO = \
RSRC_DIR = os_mac_rsrc
PRO_MANUAL = os_amiga.pro os_msdos.pro os_win16.pro os_win32.pro \
os_mswin.pro os_beos.pro os_vms.pro os_riscos.pro $(PERL_PRO)
os_mswin.pro os_beos.pro os_vms.pro $(PERL_PRO)
# Default target is making the executable and tools
all: $(VIMTARGET) $(TOOLS) languages $(GUI_BUNDLE)
src/ascii.h
+2 -7
View File
@@ -183,11 +183,6 @@ extern char MetaCharTable[];
# define PATHSEP psepc
# define PATHSEPSTR pseps
#else
# ifdef RISCOS
# define PATHSEP '.'
# define PATHSEPSTR "."
# else
# define PATHSEP '/'
# define PATHSEPSTR "/"
# endif
# define PATHSEP '/'
# define PATHSEPSTR "/"
#endif
src/auto/configure
Vendored
+5 -3
View File
@@ -18255,10 +18255,12 @@ fi
{ echo "$as_me:$LINENO: checking how to create tags" >&5
echo $ECHO_N "checking how to create tags... $ECHO_C" >&6; }
test -f tags && mv tags tags.save
if (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
TAGPRG="exctags -I INIT+ --fields=+S"
elif (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
TAGPRG="ctags -I INIT+ --fields=+S"
elif (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
TAGPRG="exctags -I INIT+ --fields=+S"
elif (eval exuberant-ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
TAGPRG="exuberant-ctags -I INIT+ --fields=+S"
else
TAGPRG="ctags"
(eval etags /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags"
src/buffer.c
-3
View File
@@ -1812,9 +1812,6 @@ free_buf_options(buf, free_p_ff)
#ifdef FEAT_AUTOCMD
clear_string_option(&buf->b_p_ft);
#endif
#ifdef FEAT_OSFILETYPE
clear_string_option(&buf->b_p_oft);
#endif
#ifdef FEAT_CINDENT
clear_string_option(&buf->b_p_cink);
clear_string_option(&buf->b_p_cino);
src/configure.in
+5 -3
View File
@@ -3433,10 +3433,12 @@ dnl -v for variables. Dangerous, most ctags take this for 'vgrind style'.
dnl -i+m to test for older Exuberant ctags
AC_MSG_CHECKING(how to create tags)
test -f tags && mv tags tags.save
if (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then
TAGPRG="exctags -I INIT+ --fields=+S"
elif (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then
if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then
TAGPRG="ctags -I INIT+ --fields=+S"
elif (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then
TAGPRG="exctags -I INIT+ --fields=+S"
elif (eval exuberant-ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then
TAGPRG="exuberant-ctags -I INIT+ --fields=+S"
else
TAGPRG="ctags"
(eval etags /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags"
src/edit.c
+57 -15
View File
@@ -1391,10 +1391,45 @@ docomplete:
goto do_intr;
#endif
normalchar:
/*
* Insert a nomal character.
*/
normalchar:
#ifdef FEAT_AUTOCMD
if (!p_paste)
{
/* Trigger the InsertCharPre event. Lock the text to avoid
* weird things from happening. */
set_vim_var_char(c);
++textlock;
if (apply_autocmds(EVENT_INSERTCHARPRE, NULL, NULL,
FALSE, curbuf))
{
/* Get the new value of v:char. If it is more than one
* character insert it literally. */
char_u *s = get_vim_var_str(VV_CHAR);
if (MB_CHARLEN(s) > 1)
{
if (stop_arrow() != FAIL)
{
ins_str(s);
AppendToRedobuffLit(s, -1);
}
c = NUL;
}
else
c = PTR2CHAR(s);
}
set_vim_var_string(VV_CHAR, NULL, -1);
--textlock;
/* If the new value is an empty string then don't insert a
* char. */
if (c == NUL)
break;
}
#endif
#ifdef FEAT_SMARTINDENT
/* Try to perform smart-indenting. */
ins_try_si(c);
@@ -1563,12 +1598,16 @@ ins_redraw(ready)
ins_ctrl_v()
{
int c;
int did_putchar = FALSE;
/* may need to redraw when no more chars available now */
ins_redraw(FALSE);
if (redrawing() && !char_avail())
{
edit_putchar('^', TRUE);
did_putchar = TRUE;
}
AppendToRedobuff((char_u *)CTRL_V_STR); /* CTRL-V */
#ifdef FEAT_CMDL_INFO
@@ -1576,8 +1615,10 @@ ins_ctrl_v()
#endif
c = get_literal();
edit_unputchar(); /* when line fits in 'columns' the '^' is at the start
of the next line and will not be redrawn */
if (did_putchar)
/* when the line fits in 'columns' the '^' is at the start of the next
* line and will not removed by the redraw */
edit_unputchar();
#ifdef FEAT_CMDL_INFO
clear_showcmd();
#endif
@@ -3495,11 +3536,7 @@ ins_compl_addfrommatch()
return;
}
p += len;
#ifdef FEAT_MBYTE
c = mb_ptr2char(p);
#else
c = *p;
#endif
c = PTR2CHAR(p);
ins_compl_addleader(c);
}
@@ -9671,6 +9708,7 @@ ins_digraph()
{
int c;
int cc;
int did_putchar = FALSE;
pc_status = PC_STATUS_UNSET;
if (redrawing() && !char_avail())
@@ -9679,6 +9717,7 @@ ins_digraph()
ins_redraw(FALSE);
edit_putchar('?', TRUE);
did_putchar = TRUE;
#ifdef FEAT_CMDL_INFO
add_to_showcmd_c(Ctrl_K);
#endif
@@ -9695,8 +9734,10 @@ ins_digraph()
c = plain_vgetc();
--no_mapping;
--allow_keys;
edit_unputchar(); /* when line fits in 'columns' the '?' is at the start
of the next line and will not be redrawn */
if (did_putchar)
/* when the line fits in 'columns' the '?' is at the start of the next
* line and will not be removed by the redraw */
edit_unputchar();
if (IS_SPECIAL(c) || mod_mask) /* special key */
{
@@ -9708,6 +9749,7 @@ ins_digraph()
}
if (c != ESC)
{
did_putchar = FALSE;
if (redrawing() && !char_avail())
{
/* may need to redraw when no more chars available now */
@@ -9715,11 +9757,9 @@ ins_digraph()
if (char2cells(c) == 1)
{
/* first remove the '?', otherwise it's restored when typing
* an ESC next */
edit_unputchar();
ins_redraw(FALSE);
edit_putchar(c, TRUE);
did_putchar = TRUE;
}
#ifdef FEAT_CMDL_INFO
add_to_showcmd_c(c);
@@ -9730,8 +9770,10 @@ ins_digraph()
cc = plain_vgetc();
--no_mapping;
--allow_keys;
edit_unputchar(); /* when line fits in 'columns' the '?' is at the
start of the next line and will not be redrawn */
if (did_putchar)
/* when the line fits in 'columns' the '?' is at the start of the
* next line and will not be removed by a redraw */
edit_unputchar();
if (cc != ESC)
{
AppendToRedobuff((char_u *)CTRL_V_STR);
src/eval.c
+5 -7
View File
@@ -352,7 +352,7 @@ static struct vimvar
{VV_NAME("swapname", VAR_STRING), VV_RO},
{VV_NAME("swapchoice", VAR_STRING), 0},
{VV_NAME("swapcommand", VAR_STRING), VV_RO},
{VV_NAME("char", VAR_STRING), VV_RO},
{VV_NAME("char", VAR_STRING), 0},
{VV_NAME("mouse_win", VAR_NUMBER), 0},
{VV_NAME("mouse_lnum", VAR_NUMBER), 0},
{VV_NAME("mouse_col", VAR_NUMBER), 0},
@@ -911,6 +911,7 @@ eval_clear()
hash_clear(&compat_hashtab);
free_scriptnames();
free_locales();
/* global variables */
vars_clear(&globvarht);
@@ -11826,9 +11827,6 @@ f_has(argvars, rettv)
#ifdef __QNX__
"qnx",
#endif
#ifdef RISCOS
"riscos",
#endif
#ifdef UNIX
"unix",
#endif
@@ -12093,9 +12091,6 @@ f_has(argvars, rettv)
#ifdef FEAT_OLE
"ole",
#endif
#ifdef FEAT_OSFILETYPE
"osfiletype",
#endif
#ifdef FEAT_PATH_EXTRA
"path_extra",
#endif
@@ -15014,7 +15009,10 @@ f_resolve(argvars, rettv)
len = STRLEN(p);
if (len > 0 && after_pathsep(p, p + len))
{
has_trailing_pathsep = TRUE;
p[len - 1] = NUL; /* the trailing slash breaks readlink() */
}
q = getnextcomp(p);
if (*q != NUL)
src/ex_cmds.c
+17 -30
View File
@@ -899,9 +899,6 @@ free_prev_shellcmd()
* Handle the ":!cmd" command. Also for ":r !cmd" and ":w !cmd"
* Bangs in the argument are replaced with the previously entered command.
* Remember the argument.
*
* RISCOS: Bangs only replaced when followed by a space, since many
* pathnames contain one.
*/
void
do_bang(addr_count, eap, forceit, do_in, do_out)
@@ -980,11 +977,7 @@ do_bang(addr_count, eap, forceit, do_in, do_out)
trailarg = NULL;
while (*p)
{
if (*p == '!'
#ifdef RISCOS
&& (p[1] == ' ' || p[1] == NUL)
#endif
)
if (*p == '!')
{
if (p > newcmd && p[-1] == '\\')
STRMOVE(p - 1, p);
@@ -1578,14 +1571,8 @@ make_filter_cmd(cmd, itmp, otmp)
if (p != NULL)
*p = NUL;
}
# ifdef RISCOS
STRCAT(buf, " { < "); /* Use RISC OS notation for input. */
STRCAT(buf, itmp);
STRCAT(buf, " } ");
# else
STRCAT(buf, " <"); /* " < " causes problems on Amiga */
STRCAT(buf, itmp);
# endif
if (*p_shq == NUL)
{
p = vim_strchr(cmd, '|');
@@ -1634,16 +1621,9 @@ append_redir(buf, buflen, opt, fname)
else
vim_snprintf((char *)end, (size_t)(buflen - (end - buf)),
#ifdef FEAT_QUICKFIX
# ifndef RISCOS
opt != p_sp ? " %s%s" :
# endif
" %s %s",
#else
# ifndef RISCOS
" %s%s", /* " > %s" causes problems on Amiga */
# else
" %s %s", /* But is needed for 'shellpipe' and RISC OS */
# endif
#endif
(char *)opt, (char *)fname);
}
@@ -1844,11 +1824,7 @@ write_viminfo(file, forceit)
#ifdef VMS
(char_u *)"-tmp",
#else
# ifdef RISCOS
(char_u *)"/tmp",
# else
(char_u *)".tmp",
# endif
#endif
FALSE);
if (tempname == NULL) /* out of memory */
@@ -4649,7 +4625,15 @@ do_sub(eap)
* for a match in this line again. */
skip_match = TRUE;
else
++matchcol; /* search for a match at next column */
{
/* search for a match at next column */
#ifdef FEAT_MBYTE
if (has_mbyte)
matchcol += mb_ptr2len(sub_firstline + matchcol);
else
#endif
++matchcol;
}
goto skip;
}
@@ -5365,8 +5349,9 @@ ex_global(eap)
global_exe(cmd)
char_u *cmd;
{
linenr_T old_lcount; /* b_ml.ml_line_count before the command */
linenr_T lnum; /* line number according to old situation */
linenr_T old_lcount; /* b_ml.ml_line_count before the command */
buf_T *old_buf = curbuf; /* remember what buffer we started in */
linenr_T lnum; /* line number according to old situation */
/*
* Set current position only once for a global command.
@@ -5410,8 +5395,10 @@ global_exe(cmd)
msg_didout = FALSE;
/* If substitutes done, report number of substitutes, otherwise report
* number of extra or deleted lines. */
if (!do_sub_msg(FALSE))
* number of extra or deleted lines.
* Don't report extra or deleted lines in the edge case where the buffer
* we are in after execution is different from the buffer we started in. */
if (!do_sub_msg(FALSE) && curbuf == old_buf)
msgmore(curbuf->b_ml.ml_line_count - old_lcount);
}
src/ex_cmds2.c
+96 -14
View File
@@ -500,18 +500,10 @@ dbg_parsearg(arg, gap)
/* Expand the file name in the same way as do_source(). This means
* doing it twice, so that $DIR/file gets expanded when $DIR is
* "~/dir". */
#ifdef RISCOS
q = mch_munge_fname(p);
#else
q = expand_env_save(p);
#endif
if (q == NULL)
return FAIL;
#ifdef RISCOS
p = mch_munge_fname(q);
#else
p = expand_env_save(q);
#endif
vim_free(q);
if (p == NULL)
return FAIL;
@@ -1541,7 +1533,7 @@ vim_dialog_save_all_changes(buf)
#endif
/*
* Ask the user what to do when abondoning a changed buffer.
* Ask the user what to do when abandoning a changed buffer.
* Must check 'write' option first!
*/
void
@@ -3013,11 +3005,7 @@ do_source(fname, check_other, is_vimrc)
proftime_T wait_start;
#endif
#ifdef RISCOS
p = mch_munge_fname(fname);
#else
p = expand_env_save(fname);
#endif
if (p == NULL)
return retval;
fname_exp = fix_fname(p);
@@ -4238,6 +4226,82 @@ ex_language(eap)
}
# if defined(FEAT_CMDL_COMPL) || defined(PROTO)
static char_u **locales = NULL; /* Array of all available locales */
static int did_init_locales = FALSE;
static void init_locales __ARGS((void));
static char_u **find_locales __ARGS((void));
/*
* Lazy initialization of all available locales.
*/
static void
init_locales()
{
if (!did_init_locales)
{
did_init_locales = TRUE;
locales = find_locales();
}
}
/* Return an array of strings for all available locales + NULL for the
* last element. Return NULL in case of error. */
static char_u **
find_locales()
{
garray_T locales_ga;
char_u *loc;
/* Find all available locales by running command "locale -a". If this
* doesn't work we won't have completion. */
char_u *locale_a = get_cmd_output((char_u *)"locale -a",
NULL, SHELL_SILENT);
if (locale_a == NULL)
return NULL;
ga_init2(&locales_ga, sizeof(char_u *), 20);
/* Transform locale_a string where each locale is separated by "\n"
* into an array of locale strings. */
loc = (char_u *)strtok((char *)locale_a, "\n");
while (loc != NULL)
{
if (ga_grow(&locales_ga, 1) == FAIL)
break;
loc = vim_strsave(loc);
if (loc == NULL)
break;
((char_u **)locales_ga.ga_data)[locales_ga.ga_len++] = loc;
loc = (char_u *)strtok(NULL, "\n");
}
vim_free(locale_a);
if (ga_grow(&locales_ga, 1) == FAIL)
{
ga_clear(&locales_ga);
return NULL;
}
((char_u **)locales_ga.ga_data)[locales_ga.ga_len] = NULL;
return (char_u **)locales_ga.ga_data;
}
# if defined(EXITFREE) || defined(PROTO)
void
free_locales()
{
int i;
if (locales != NULL)
{
for (i = 0; locales[i] != NULL; i++)
vim_free(locales[i]);
vim_free(locales);
locales = NULL;
}
}
# endif
/*
* Function given to ExpandGeneric() to obtain the possible arguments of the
* ":language" command.
@@ -4253,7 +4317,25 @@ get_lang_arg(xp, idx)
return (char_u *)"ctype";
if (idx == 2)
return (char_u *)"time";
return NULL;
init_locales();
if (locales == NULL)
return NULL;
return locales[idx - 3];
}
/*
* Function given to ExpandGeneric() to obtain the available locales.
*/
char_u *
get_locales(xp, idx)
expand_T *xp UNUSED;
int idx;
{
init_locales();
if (locales == NULL)
return NULL;
return locales[idx];
}
# endif
src/ex_docmd.c
+15 -16
View File
@@ -3871,13 +3871,24 @@ set_one_cmd_context(xp, buff)
#if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
&& (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))
case CMD_language:
if (*skiptowhite(arg) == NUL)
p = skiptowhite(arg);
if (*p == NUL)
{
xp->xp_context = EXPAND_LANGUAGE;
xp->xp_pattern = arg;
}
else
xp->xp_context = EXPAND_NOTHING;
{
if ( STRNCMP(arg, "messages", p - arg) == 0
|| STRNCMP(arg, "ctype", p - arg) == 0
|| STRNCMP(arg, "time", p - arg) == 0)
{
xp->xp_context = EXPAND_LOCALES;
xp->xp_pattern = skipwhite(p);
}
else
xp->xp_context = EXPAND_NOTHING;
}
break;
#endif
#if defined(FEAT_PROFILE)
@@ -6490,7 +6501,7 @@ ex_close(eap)
{
# ifdef FEAT_CMDWIN
if (cmdwin_type != 0)
cmdwin_result = K_IGNORE;
cmdwin_result = Ctrl_C;
else
# endif
if (!text_locked()
@@ -9722,14 +9733,7 @@ eval_vars(src, srcstart, usedlen, lnump, errormsg, escaped)
valid = 0; /* Must have ":p:h" to be valid */
}
else
#ifdef RISCOS
/* Always use the full path for RISC OS if possible. */
result = curbuf->b_ffname;
if (result == NULL)
result = curbuf->b_fname;
#else
result = curbuf->b_fname;
#endif
break;
case SPEC_HASH: /* '#' or "#99": alternate file */
@@ -9874,11 +9878,7 @@ eval_vars(src, srcstart, usedlen, lnump, errormsg, escaped)
if (src[*usedlen] == '<') /* remove the file name extension */
{
++*usedlen;
#ifdef RISCOS
if ((s = vim_strrchr(result, '/')) != NULL && s >= gettail(result))
#else
if ((s = vim_strrchr(result, '.')) != NULL && s >= gettail(result))
#endif
resultlen = (int)(s - result);
}
#ifdef FEAT_MODIFY_FNAME
@@ -10903,8 +10903,7 @@ get_view_file(c)
else if (vim_ispathsep(*p))
{
*s++ = '=';
#if defined(BACKSLASH_IN_FILENAME) || defined(AMIGA) || defined(RISCOS) \
|| defined(VMS)
#if defined(BACKSLASH_IN_FILENAME) || defined(AMIGA) || defined(VMS)
if (*p == ':')
*s++ = '-';
else
src/ex_getln.c
+38 -25
View File
@@ -4582,50 +4582,52 @@ ExpandFromContext(xp, pat, num_file, file, options)
int context;
char_u *((*func)__ARGS((expand_T *, int)));
int ic;
int escaped;
} tab[] =
{
{EXPAND_COMMANDS, get_command_name, FALSE},
{EXPAND_BEHAVE, get_behave_arg, TRUE},
{EXPAND_COMMANDS, get_command_name, FALSE, TRUE},
{EXPAND_BEHAVE, get_behave_arg, TRUE, TRUE},
#ifdef FEAT_USR_CMDS
{EXPAND_USER_COMMANDS, get_user_commands, FALSE},
{EXPAND_USER_CMD_FLAGS, get_user_cmd_flags, FALSE},
{EXPAND_USER_NARGS, get_user_cmd_nargs, FALSE},
{EXPAND_USER_COMPLETE, get_user_cmd_complete, FALSE},
{EXPAND_USER_COMMANDS, get_user_commands, FALSE, TRUE},
{EXPAND_USER_CMD_FLAGS, get_user_cmd_flags, FALSE, TRUE},
{EXPAND_USER_NARGS, get_user_cmd_nargs, FALSE, TRUE},
{EXPAND_USER_COMPLETE, get_user_cmd_complete, FALSE, TRUE},
#endif
#ifdef FEAT_EVAL
{EXPAND_USER_VARS, get_user_var_name, FALSE},
{EXPAND_FUNCTIONS, get_function_name, FALSE},
{EXPAND_USER_FUNC, get_user_func_name, FALSE},
{EXPAND_EXPRESSION, get_expr_name, FALSE},
{EXPAND_USER_VARS, get_user_var_name, FALSE, TRUE},
{EXPAND_FUNCTIONS, get_function_name, FALSE, TRUE},
{EXPAND_USER_FUNC, get_user_func_name, FALSE, TRUE},
{EXPAND_EXPRESSION, get_expr_name, FALSE, TRUE},
#endif
#ifdef FEAT_MENU
{EXPAND_MENUS, get_menu_name, FALSE},
{EXPAND_MENUNAMES, get_menu_names, FALSE},
{EXPAND_MENUS, get_menu_name, FALSE, TRUE},
{EXPAND_MENUNAMES, get_menu_names, FALSE, TRUE},
#endif
#ifdef FEAT_SYN_HL
{EXPAND_SYNTAX, get_syntax_name, TRUE},
{EXPAND_SYNTAX, get_syntax_name, TRUE, TRUE},
#endif
{EXPAND_HIGHLIGHT, get_highlight_name, TRUE},
{EXPAND_HIGHLIGHT, get_highlight_name, TRUE, TRUE},
#ifdef FEAT_AUTOCMD
{EXPAND_EVENTS, get_event_name, TRUE},
{EXPAND_AUGROUP, get_augroup_name, TRUE},
{EXPAND_EVENTS, get_event_name, TRUE, TRUE},
{EXPAND_AUGROUP, get_augroup_name, TRUE, TRUE},
#endif
#ifdef FEAT_CSCOPE
{EXPAND_CSCOPE, get_cscope_name, TRUE},
{EXPAND_CSCOPE, get_cscope_name, TRUE, TRUE},
#endif
#ifdef FEAT_SIGNS
{EXPAND_SIGN, get_sign_name, TRUE},
{EXPAND_SIGN, get_sign_name, TRUE, TRUE},
#endif
#ifdef FEAT_PROFILE
{EXPAND_PROFILE, get_profile_name, TRUE},
{EXPAND_PROFILE, get_profile_name, TRUE, TRUE},
#endif
#if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
&& (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))
{EXPAND_LANGUAGE, get_lang_arg, TRUE},
{EXPAND_LANGUAGE, get_lang_arg, TRUE, FALSE},
{EXPAND_LOCALES, get_locales, TRUE, FALSE},
#endif
{EXPAND_ENV_VARS, get_env_name, TRUE},
{EXPAND_ENV_VARS, get_env_name, TRUE, TRUE},
#ifdef FEAT_GUI_MACVIM
{EXPAND_MACACTION, get_macaction_name, FALSE},
{EXPAND_MACACTION, get_macaction_name, FALSE, FALSE},
#endif
};
int i;
@@ -4640,7 +4642,8 @@ ExpandFromContext(xp, pat, num_file, file, options)
{
if (tab[i].ic)
regmatch.rm_ic = TRUE;
ret = ExpandGeneric(xp, &regmatch, num_file, file, tab[i].func);
ret = ExpandGeneric(xp, &regmatch, num_file, file,
tab[i].func, tab[i].escaped);
break;
}
}
@@ -4662,13 +4665,14 @@ ExpandFromContext(xp, pat, num_file, file, options)
* Returns OK when no problems encountered, FAIL for error (out of memory).
*/
int
ExpandGeneric(xp, regmatch, num_file, file, func)
ExpandGeneric(xp, regmatch, num_file, file, func, escaped)
expand_T *xp;
regmatch_T *regmatch;
int *num_file;
char_u ***file;
char_u *((*func)__ARGS((expand_T *, int)));
/* returns a string from the list */
int escaped;
{
int i;
int count = 0;
@@ -4693,7 +4697,10 @@ ExpandGeneric(xp, regmatch, num_file, file, func)
{
if (round)
{
str = vim_strsave_escaped(str, (char_u *)" \t\\.");
if (escaped)
str = vim_strsave_escaped(str, (char_u *)" \t\\.");
else
str = vim_strsave(str);
(*file)[count] = str;
#ifdef FEAT_MENU
if (func == get_menu_names && str != NULL)
@@ -6338,6 +6345,12 @@ ex_window()
ccline.cmdbuff = vim_strsave((char_u *)"qa");
cmdwin_result = CAR;
}
else if (cmdwin_result == Ctrl_C)
{
/* :q or :close, don't execute any command
* and don't modify the cmd window. */
ccline.cmdbuff = NULL;
}
else
ccline.cmdbuff = vim_strsave(ml_get_curline());
if (ccline.cmdbuff == NULL)
src/feature.h
-9
View File
@@ -505,15 +505,6 @@
# define FEAT_WILDMENU
#endif
/*
* +osfiletype filetype checking in autocommand patterns.
* Only on systems that support filetypes (RISC OS).
*/
#if 0
# define FEAT_OSFILETYPE
# define DFLT_OFT "Text"
#endif
/*
* +viminfo reading/writing the viminfo file. Takes about 8Kbyte
* of code.
src/fileio.c
+7 -58
View File
@@ -504,18 +504,11 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
if (newfile && !read_stdin && !read_buffer)
{
/* Remember time of file.
* For RISCOS, also remember the filetype.
*/
/* Remember time of file. */
if (mch_stat((char *)fname, &st) >= 0)
{
buf_store_time(curbuf, &st, fname);
curbuf->b_mtime_read = curbuf->b_mtime;
#if defined(RISCOS) && defined(FEAT_OSFILETYPE)
/* Read the filetype into the buffer local filetype option. */
mch_read_filetype(fname);
#endif
#ifdef UNIX
/*
* Use the protection bits of the original file for the swap file.
@@ -557,7 +550,6 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
/*
* for UNIX: check readonly with perm and mch_access()
* for RISCOS: same as Unix, otherwise file gets re-datestamped!
* for MSDOS and Amiga: check readonly by trying to open the file for writing
*/
file_readonly = FALSE;
@@ -3804,13 +3796,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
/* make sure we have a valid backup extension to use */
if (*p_bex == NUL)
{
#ifdef RISCOS
backup_ext = (char_u *)"/bak";
#else
backup_ext = (char_u *)".bak";
#endif
}
else
backup_ext = p_bex;
@@ -4724,11 +4710,6 @@ restore_backup:
#endif
if (perm >= 0) /* set perm. of new file same as old file */
(void)mch_setperm(wfname, perm);
#ifdef RISCOS
if (!append && !filtering)
/* Set the filetype after writing the file. */
mch_set_filetype(wfname, buf->b_p_oft);
#endif
#ifdef HAVE_ACL
/* Probably need to set the ACL before changing the user (can't set the
* ACL on a file the user doesn't own). */
@@ -6267,19 +6248,17 @@ buf_modname(shortname, fname, ext, prepend_dot)
*/
for (ptr = retval + fnamelen; ptr > retval; mb_ptr_back(retval, ptr))
{
#ifndef RISCOS
if (*ext == '.'
# ifdef USE_LONG_FNAME
#ifdef USE_LONG_FNAME
&& (!USE_LONG_FNAME || shortname)
# else
# ifndef SHORT_FNAME
#else
# ifndef SHORT_FNAME
&& shortname
# endif
# endif
#endif
)
if (*ptr == '.') /* replace '.' by '_' */
*ptr = '_';
#endif
if (vim_ispathsep(*ptr))
{
++ptr;
@@ -6314,23 +6293,14 @@ buf_modname(shortname, fname, ext, prepend_dot)
if (fname == NULL || *fname == NUL
|| vim_ispathsep(fname[STRLEN(fname) - 1]))
{
#ifdef RISCOS
if (*ext == '/')
#else
if (*ext == '.')
#endif
*s++ = '_';
}
/*
* If the extension starts with '.', truncate the base name at 8
* characters
*/
#ifdef RISCOS
/* We normally use '/', but swap files are '_' */
else if (*ext == '/' || *ext == '_')
#else
else if (*ext == '.')
#endif
{
if ((size_t)(s - ptr) > (size_t)8)
{
@@ -6342,13 +6312,8 @@ buf_modname(shortname, fname, ext, prepend_dot)
* If the extension doesn't start with '.', and the file name
* doesn't have an extension yet, append a '.'
*/
#ifdef RISCOS
else if ((e = vim_strchr(ptr, '/')) == NULL)
*s++ = '/';
#else
else if ((e = vim_strchr(ptr, '.')) == NULL)
*s++ = '.';
#endif
/*
* If the extension doesn't start with '.', and there already is an
* extension, it may need to be truncated
@@ -6376,23 +6341,14 @@ buf_modname(shortname, fname, ext, prepend_dot)
/*
* Prepend the dot.
*/
if (prepend_dot && !shortname && *(e = gettail(retval)) !=
#ifdef RISCOS
'/'
#else
'.'
#endif
if (prepend_dot && !shortname && *(e = gettail(retval)) != '.'
#ifdef USE_LONG_FNAME
&& USE_LONG_FNAME
#endif
)
{
STRMOVE(e + 1, e);
#ifdef RISCOS
*e = '/';
#else
*e = '.';
#endif
}
#endif
@@ -7744,6 +7700,7 @@ static struct event_name
{"InsertChange", EVENT_INSERTCHANGE},
{"InsertEnter", EVENT_INSERTENTER},
{"InsertLeave", EVENT_INSERTLEAVE},
{"InsertCharPre", EVENT_INSERTCHARPRE},
{"MenuPopup", EVENT_MENUPOPUP},
{"QuickFixCmdPost", EVENT_QUICKFIXCMDPOST},
{"QuickFixCmdPre", EVENT_QUICKFIXCMDPRE},
@@ -10243,19 +10200,11 @@ file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash)
++p;
break;
case '.':
#ifdef RISCOS
if (allow_dirs != NULL)
*allow_dirs = TRUE;
/* FALLTHROUGH */
#endif
case '~':
reg_pat[i++] = '\\';
reg_pat[i++] = *p;
break;
case '?':
#ifdef RISCOS
case '#':
#endif
reg_pat[i++] = '.';
break;
case '\\':
src/globals.h
+1 -1
View File
@@ -1517,7 +1517,7 @@ EXTERN char_u e_readerrf[] INIT(= N_("E47: Error while reading errorfile"));
EXTERN char_u e_sandbox[] INIT(= N_("E48: Not allowed in sandbox"));
#endif
EXTERN char_u e_secure[] INIT(= N_("E523: Not allowed here"));
#if defined(AMIGA) || defined(MACOS) || defined(MSWIN) || defined(RISCOS) \
#if defined(AMIGA) || defined(MACOS) || defined(MSWIN) \
|| defined(UNIX) || defined(VMS) || defined(OS2)
EXTERN char_u e_screenmode[] INIT(= N_("E359: Screen mode setting not supported"));
#endif
src/gui.c
+4 -19
View File
@@ -2177,7 +2177,7 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back)
if (highlight_mask & (HL_INVERSE | HL_STANDOUT))
{
#if defined(AMIGA) || defined(RISCOS)
#if defined(AMIGA)
gui_mch_set_colors(bg_color, fg_color);
#else
gui_mch_set_fg_color(bg_color);
@@ -2186,7 +2186,7 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back)
}
else
{
#if defined(AMIGA) || defined(RISCOS)
#if defined(AMIGA)
gui_mch_set_colors(fg_color, bg_color);
#else
gui_mch_set_fg_color(fg_color);
@@ -2214,7 +2214,7 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back)
if (back != 0 && ((draw_flags & DRAW_BOLD) || (highlight_mask & HL_ITALIC)))
return FAIL;
#if defined(RISCOS) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MACVIM)
#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MACVIM)
/* If there's no italic font, then fake it.
* For GTK2, we don't need a different font for italic style. */
if (hl_mask_todo & HL_ITALIC)
@@ -3033,26 +3033,11 @@ button_set:
did_clip = TRUE;
}
/* Allow the left button to start the selection */
else if (button ==
# ifdef RISCOS
/* Only start a drag on a drag event. Otherwise
* we don't get a release event. */
MOUSE_DRAG
# else
MOUSE_LEFT
# endif
)
else if (button == MOUSE_LEFT)
{
clip_start_selection(X_2_COL(x), Y_2_ROW(y), repeated_click);
did_clip = TRUE;
}
# ifdef RISCOS
else if (button == MOUSE_LEFT)
{
clip_clear_selection();
did_clip = TRUE;
}
# endif
/* Always allow pasting */
if (button != MOUSE_MIDDLE)
src/gui.h
+1 -16
View File
@@ -52,10 +52,6 @@
# include <SegLoad.h>*/
#endif
#ifdef RISCOS
# include "gui_riscos.h"
#endif
#ifdef FEAT_GUI_PHOTON
# include <Ph.h>
# include <Pt.h>
@@ -152,7 +148,7 @@
#define DRAW_BOLD 0x02 /* draw bold text */
#define DRAW_UNDERL 0x04 /* draw underline text */
#define DRAW_UNDERC 0x08 /* draw undercurl text */
#if defined(RISCOS) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MACVIM)
#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MACVIM)
# define DRAW_ITALIC 0x10 /* draw italic text */
#endif
#define DRAW_CURSOR 0x20 /* drawing block cursor (win32) */
@@ -222,9 +218,6 @@ typedef struct GuiScrollbar
#ifdef FEAT_GUI_MAC
ControlHandle id; /* A handle to the scrollbar */
#endif
#ifdef RISCOS
int id; /* Window handle of scrollbar window */
#endif
#ifdef FEAT_GUI_PHOTON
PtWidget_t *id;
#endif
@@ -458,14 +451,6 @@ typedef struct Gui
int visibility; /* Is window partially/fully obscured? */
#endif
#ifdef RISCOS
int window_handle;
char_u *window_title;
int window_title_size;
int fg_colour; /* in 0xBBGGRR format */
int bg_colour;
#endif
#ifdef FEAT_GUI_PHOTON
PtWidget_t *vimWindow; /* PtWindow */
PtWidget_t *vimTextArea; /* PtRaw */
src/gui_riscos.c
-3558
View File
File diff suppressed because it is too large Load Diff
src/gui_riscos.h
-32
View File
@@ -1,32 +0,0 @@
/* vi:set ts=8 sts=4 sw=4:
*
* VIM - Vi IMproved by Bram Moolenaar
*
* Do ":help uganda" in Vim to read copying and usage conditions.
* Do ":help credits" in Vim to see a list of people who contributed.
*/
#define FEAT_BROWSE
#define TASK 0x4b534154
/* Nested wimp flags: */
#define CHILD_FIX_TO_WORKAREA 0
#define CHILD_FIX_TO_LEFT 1
#define CHILD_FIX_TO_BOTTOM 1
#define CHILD_FIX_TO_RIGHT 2
#define CHILD_FIX_TO_TOP 2
#define CHILD_SELF_SCROLL 0
#define CHILD_PARENT_SCROLL 1
#define CHILD_LEFT 16
#define CHILD_BOTTOM 18
#define CHILD_RIGHT 20
#define CHILD_TOP 22
#define CHILD_SCROLL_X 24
#define CHILD_SCROLL_Y 26
int wimp_poll(int mask, int *block);
int wimp_poll_idle(int mask, int *block, int end_time);
void ro_open_main(int *block);
src/gui_w32.c
+1 -1
View File
@@ -1575,7 +1575,7 @@ gui_mch_init(void)
#ifdef FEAT_EVAL
/* set the v:windowid variable */
set_vim_var_nr(VV_WINDOWID, (long)s_hwnd);
set_vim_var_nr(VV_WINDOWID, HandleToLong(s_hwnd));
#endif
theend:
src/if_ole.h
+5 -2
View File
@@ -46,8 +46,11 @@ typedef struct Vim Vim;
/* header files for imported files */
#include "oaidl.h"
void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t);
void __RPC_USER MIDL_user_free( void __RPC_FAR * );
#ifndef __MIDL_user_allocate_free_DEFINED__
#define __MIDL_user_allocate_free_DEFINED__
void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t);
void __RPC_USER MIDL_user_free( void __RPC_FAR * );
#endif
#ifndef __IVim_INTERFACE_DEFINED__
#define __IVim_INTERFACE_DEFINED__
src/main.c
-5
View File
@@ -3365,11 +3365,6 @@ usage()
main_msg(_("+reverse\t\tDon't use reverse video (also: +rv)"));
main_msg(_("-xrm <resource>\tSet the specified resource"));
#endif /* FEAT_GUI_X11 */
#if defined(FEAT_GUI) && defined(RISCOS)
mch_msg(_("\nArguments recognised by gvim (RISC OS version):\n"));
main_msg(_("--columns <number>\tInitial width of window in columns"));
main_msg(_("--rows <number>\tInitial height of window in rows"));
#endif
#ifdef FEAT_GUI_GTK
mch_msg(_("\nArguments recognised by gvim (GTK+ version):\n"));
main_msg(_("-font <font>\t\tUse <font> for normal text (also: -fn)"));
src/memfile.c
+1 -1
View File
@@ -1307,7 +1307,7 @@ mf_do_open(mfp, fname, flags)
* fname cannot be NameBuff, because it must have been allocated.
*/
mf_set_ffname(mfp);
#if defined(MSDOS) || defined(MSWIN) || defined(RISCOS)
#if defined(MSDOS) || defined(MSWIN)
/*
* A ":!cd e:xxx" may change the directory without us knowning, use the
* full pathname always. Careful: This frees fname!
src/memline.c
+7 -35
View File
@@ -748,7 +748,7 @@ ml_open_file(buf)
continue;
if (mf_open_file(mfp, fname) == OK) /* consumes fname! */
{
#if defined(MSDOS) || defined(MSWIN) || defined(RISCOS)
#if defined(MSDOS) || defined(MSWIN)
/*
* set full pathname for swap file now, because a ":!cd dir" may
* change directory without us knowing it.
@@ -933,7 +933,7 @@ set_b0_fname(b0p, buf)
b0p->b0_fname[0] = NUL;
else
{
#if defined(MSDOS) || defined(MSWIN) || defined(AMIGA) || defined(RISCOS)
#if defined(MSDOS) || defined(MSWIN) || defined(AMIGA)
/* Systems that cannot translate "~user" back into a path: copy the
* file name unmodified. Do use slashes instead of backslashes for
* portability. */
@@ -1103,7 +1103,7 @@ ml_recover()
fname = (char_u *)"";
len = (int)STRLEN(fname);
if (len >= 4 &&
#if defined(VMS) || defined(RISCOS)
#if defined(VMS)
STRNICMP(fname + len - 4, "_s" , 2)
#else
STRNICMP(fname + len - 4, ".s" , 2)
@@ -1773,11 +1773,7 @@ recover_names(fname, list, nr, fname_out)
#ifdef VMS
names[0] = vim_strsave((char_u *)"*_sw%");
#else
# ifdef RISCOS
names[0] = vim_strsave((char_u *)"*_sw#");
# else
names[0] = vim_strsave((char_u *)"*.sw?");
# endif
#endif
#if defined(UNIX) || defined(WIN3264)
/* For Unix names starting with a dot are special. MS-Windows
@@ -1804,11 +1800,7 @@ recover_names(fname, list, nr, fname_out)
#ifdef VMS
names[0] = concat_fnames(dir_name, (char_u *)"*_sw%", TRUE);
#else
# ifdef RISCOS
names[0] = concat_fnames(dir_name, (char_u *)"*_sw#", TRUE);
# else
names[0] = concat_fnames(dir_name, (char_u *)"*.sw?", TRUE);
# endif
#endif
#if defined(UNIX) || defined(WIN3264)
/* For Unix names starting with a dot are special. MS-Windows
@@ -1877,7 +1869,7 @@ recover_names(fname, list, nr, fname_out)
char_u *swapname;
swapname = modname(fname_res,
#if defined(VMS) || defined(RISCOS)
#if defined(VMS)
(char_u *)"_swp", FALSE
#else
(char_u *)".swp", TRUE
@@ -2176,11 +2168,7 @@ recov_file_names(names, path, prepend_dot)
#ifdef VMS
names[num_names] = concat_fnames(path, (char_u *)"_sw%", FALSE);
#else
# ifdef RISCOS
names[num_names] = concat_fnames(path, (char_u *)"_sw#", FALSE);
# else
names[num_names] = concat_fnames(path, (char_u *)".sw?", FALSE);
# endif
#endif
if (names[num_names] == NULL)
goto end;
@@ -2207,11 +2195,7 @@ recov_file_names(names, path, prepend_dot)
#ifdef VMS
names[num_names] = modname(path, (char_u *)"_sw%", FALSE);
#else
# ifdef RISCOS
names[num_names] = modname(path, (char_u *)"_sw#", FALSE);
# else
names[num_names] = modname(path, (char_u *)".sw?", FALSE);
# endif
#endif
if (names[num_names] == NULL)
goto end;
@@ -3205,7 +3189,8 @@ ml_delete_int(buf, lnum, message)
mf_free(mfp, hp); /* free the data block */
buf->b_ml.ml_locked = NULL;
for (stack_idx = buf->b_ml.ml_stack_top - 1; stack_idx >= 0; --stack_idx)
for (stack_idx = buf->b_ml.ml_stack_top - 1; stack_idx >= 0;
--stack_idx)
{
buf->b_ml.ml_stack_top = 0; /* stack is invalid when failing */
ip = &(buf->b_ml.ml_stack[stack_idx]);
@@ -3956,14 +3941,9 @@ makeswapname(fname, ffname, buf, dir_name)
#else
(buf->b_p_sn || buf->b_shortname),
#endif
#ifdef RISCOS
/* Avoid problems if fname has special chars, eg <Wimp$Scrap> */
ffname,
#else
fname_res,
#endif
(char_u *)
#if defined(VMS) || defined(RISCOS)
#if defined(VMS)
"_swp",
#else
".swp",
@@ -4427,14 +4407,6 @@ findswapname(buf, dirp, old_fname)
}
close(fd);
}
#ifdef RISCOS
else
/* Can't open swap file, though it does exist.
* Assume that the user is editing two files with
* the same name in different directories. No error.
*/
differ = TRUE;
#endif
/* give the ATTENTION message when there is an old swap file
* for the current file, and the buffer was not recovered. */
src/misc1.c
+214 -61
View File
@@ -1561,6 +1561,9 @@ get_leader_len(line, flags, backward)
char_u part_buf[COM_MAX_LEN]; /* buffer for one option part */
char_u *string; /* pointer to comment string */
char_u *list;
int middle_match_len = 0;
char_u *prev_list;
char_u *saved_flags = NULL;
i = 0;
while (vim_iswhite(line[i])) /* leading white space is ignored */
@@ -1569,7 +1572,7 @@ get_leader_len(line, flags, backward)
/*
* Repeat to match several nested comment strings.
*/
while (line[i])
while (line[i] != NUL)
{
/*
* scan through the 'comments' option for a match
@@ -1577,82 +1580,104 @@ get_leader_len(line, flags, backward)
found_one = FALSE;
for (list = curbuf->b_p_com; *list; )
{
/*
* Get one option part into part_buf[]. Advance list to next one.
* put string at start of string.
*/
if (!got_com && flags != NULL) /* remember where flags started */
*flags = list;
/* Get one option part into part_buf[]. Advance "list" to next
* one. Put "string" at start of string. */
if (!got_com && flags != NULL)
*flags = list; /* remember where flags started */
prev_list = list;
(void)copy_option_part(&list, part_buf, COM_MAX_LEN, ",");
string = vim_strchr(part_buf, ':');
if (string == NULL) /* missing ':', ignore this part */
continue;
*string++ = NUL; /* isolate flags from string */
/*
* When already found a nested comment, only accept further
* nested comments.
*/
/* If we found a middle match previously, use that match when this
* is not a middle or end. */
if (middle_match_len != 0
&& vim_strchr(part_buf, COM_MIDDLE) == NULL
&& vim_strchr(part_buf, COM_END) == NULL)
break;
/* When we already found a nested comment, only accept further
* nested comments. */
if (got_com && vim_strchr(part_buf, COM_NEST) == NULL)
continue;
/* When 'O' flag used don't use for "O" command */
/* When 'O' flag present and using "O" command skip this one. */
if (backward && vim_strchr(part_buf, COM_NOBACK) != NULL)
continue;
/*
* Line contents and string must match.
/* Line contents and string must match.
* When string starts with white space, must have some white space
* (but the amount does not need to match, there might be a mix of
* TABs and spaces).
*/
* TABs and spaces). */
if (vim_iswhite(string[0]))
{
if (i == 0 || !vim_iswhite(line[i - 1]))
continue;
continue; /* missing shite space */
while (vim_iswhite(string[0]))
++string;
}
for (j = 0; string[j] != NUL && string[j] == line[i + j]; ++j)
;
if (string[j] != NUL)
continue;
continue; /* string doesn't match */
/*
* When 'b' flag used, there must be white space or an
* end-of-line after the string in the line.
*/
/* When 'b' flag used, there must be white space or an
* end-of-line after the string in the line. */
if (vim_strchr(part_buf, COM_BLANK) != NULL
&& !vim_iswhite(line[i + j]) && line[i + j] != NUL)
continue;
/*
* We have found a match, stop searching.
*/
i += j;
got_com = TRUE;
/* We have found a match, stop searching unless this is a middle
* comment. The middle comment can be a substring of the end
* comment in which case it's better to return the length of the
* end comment and its flags. Thus we keep searching with middle
* and end matches and use an end match if it matches better. */
if (vim_strchr(part_buf, COM_MIDDLE) != NULL)
{
if (middle_match_len == 0)
{
middle_match_len = j;
saved_flags = prev_list;
}
continue;
}
if (middle_match_len != 0 && j > middle_match_len)
/* Use this match instead of the middle match, since it's a
* longer thus better match. */
middle_match_len = 0;
if (middle_match_len == 0)
i += j;
found_one = TRUE;
break;
}
/*
* No match found, stop scanning.
*/
if (middle_match_len != 0)
{
/* Use the previously found middle match after failing to find a
* match with an end. */
if (!got_com && flags != NULL)
*flags = saved_flags;
i += middle_match_len;
found_one = TRUE;
}
/* No match found, stop scanning. */
if (!found_one)
break;
/*
* Include any trailing white space.
*/
/* Include any trailing white space. */
while (vim_iswhite(line[i]))
++i;
/*
* If this comment doesn't nest, stop here.
*/
/* If this comment doesn't nest, stop here. */
got_com = TRUE;
if (vim_strchr(part_buf, COM_NEST) == NULL)
break;
}
return (got_com ? i : 0);
}
#endif
@@ -4570,25 +4595,21 @@ get_past_head(path)
vim_ispathsep(c)
int c;
{
#ifdef RISCOS
return (c == '.' || c == ':');
#else
# ifdef UNIX
#ifdef UNIX
return (c == '/'); /* UNIX has ':' inside file names */
# else
# ifdef BACKSLASH_IN_FILENAME
#else
# ifdef BACKSLASH_IN_FILENAME
return (c == ':' || c == '/' || c == '\\');
# else
# ifdef VMS
# else
# ifdef VMS
/* server"user passwd"::device:[full.path.name]fname.extension;version" */
return (c == ':' || c == '[' || c == ']' || c == '/'
|| c == '<' || c == '>' || c == '"' );
# else /* Amiga */
# else
return (c == ':' || c == '/');
# endif /* VMS */
# endif
# endif /* VMS */
# endif
#endif /* RISC OS */
#endif
}
#if defined(FEAT_SEARCHPATH) || defined(PROTO)
@@ -4944,6 +4965,7 @@ static pos_T *find_match_paren __ARGS((int, int));
static int corr_ind_maxparen __ARGS((int ind_maxparen, pos_T *startpos));
static int find_last_paren __ARGS((char_u *l, int start, int end));
static int find_match __ARGS((int lookfor, linenr_T ourscope, int ind_maxparen, int ind_maxcomment));
static int cin_is_cpp_namespace __ARGS((char_u *));
static int ind_hash_comment = 0; /* # starts a comment */
@@ -4989,7 +5011,7 @@ cin_skipcomment(s)
}
/*
* Return TRUE if there there is no code at *s. White space and comments are
* Return TRUE if there is no code at *s. White space and comments are
* not considered code.
*/
static int
@@ -5206,6 +5228,50 @@ cin_isscopedecl(s)
return (*(s = cin_skipcomment(s + i)) == ':' && s[1] != ':');
}
/* Maximum number of lines to search back for a "namespace" line. */
#define FIND_NAMESPACE_LIM 20
/*
* Recognize a "namespace" scope declaration.
*/
static int
cin_is_cpp_namespace(s)
char_u *s;
{
char_u *p;
int has_name = FALSE;
s = cin_skipcomment(s);
if (STRNCMP(s, "namespace", 9) == 0 && (s[9] == NUL || !vim_iswordc(s[9])))
{
p = cin_skipcomment(skipwhite(s + 9));
while (*p != NUL)
{
if (vim_iswhite(*p))
{
has_name = TRUE; /* found end of a name */
p = cin_skipcomment(skipwhite(p));
}
else if (*p == '{')
{
break;
}
else if (vim_iswordc(*p))
{
if (has_name)
return FALSE; /* word character after skipping past name */
++p;
}
else
{
return FALSE;
}
}
return TRUE;
}
return FALSE;
}
/*
* Return a pointer to the first non-empty non-comment character after a ':'.
* Return NULL if not found.
@@ -5464,8 +5530,11 @@ cin_islinecomment(p)
}
/*
* Recognize a line that starts with '{' or '}', or ends with ';', '{' or '}'.
* Recognize a line that starts with '{' or '}', or ends with ';', ',', '{' or
* '}'.
* Don't consider "} else" a terminated line.
* If a line begins with an "else", only consider it terminated if no unmatched
* opening braces follow (handle "else { foo();" correctly).
* Return the character terminating the line (ending char's have precedence if
* both apply in order to determine initializations).
*/
@@ -5475,21 +5544,35 @@ cin_isterminated(s, incl_open, incl_comma)
int incl_open; /* include '{' at the end as terminator */
int incl_comma; /* recognize a trailing comma */
{
char_u found_start = 0;
char_u found_start = 0;
unsigned n_open = 0;
int is_else = FALSE;
s = cin_skipcomment(s);
if (*s == '{' || (*s == '}' && !cin_iselse(s)))
found_start = *s;
if (!found_start)
is_else = cin_iselse(s);
while (*s)
{
/* skip over comments, "" strings and 'c'haracters */
s = skip_string(cin_skipcomment(s));
if ((*s == ';' || (incl_open && *s == '{') || *s == '}'
|| (incl_comma && *s == ','))
if (*s == '}' && n_open > 0)
--n_open;
if ((!is_else || n_open == 0)
&& (*s == ';' || *s == '}' || (incl_comma && *s == ','))
&& cin_nocode(s + 1))
return *s;
else if (*s == '{')
{
if (incl_open && cin_nocode(s + 1))
return *s;
else
++n_open;
}
if (*s)
s++;
@@ -5794,7 +5877,9 @@ cin_is_cpp_baseclass(col)
continue;
}
if (s[0] == ':')
if (s[0] == '"')
s = skip_string(s) + 1;
else if (s[0] == ':')
{
if (s[1] == ':')
{
@@ -6262,6 +6347,11 @@ get_c_indent()
*/
int ind_keep_case_label = 0;
/*
* handle C++ namespace
*/
int ind_cpp_namespace = 0;
pos_T cur_curpos;
int amount;
int scope_amount;
@@ -6302,6 +6392,7 @@ get_c_indent()
int n;
int iscase;
int lookfor_break;
int lookfor_cpp_namespace = FALSE;
int cont_amount = 0; /* amount for continuation line */
int original_line_islabel;
@@ -6375,6 +6466,7 @@ get_c_indent()
case 'J': ind_js = n; break;
case 'l': ind_keep_case_label = n; break;
case '#': ind_hash_comment = n; break;
case 'N': ind_cpp_namespace = n; break;
}
if (*options == ',')
++options;
@@ -6942,11 +7034,24 @@ get_c_indent()
if (start_brace == BRACE_IN_COL0) /* '{' is in column 0 */
{
amount = ind_open_left_imag;
lookfor_cpp_namespace = TRUE;
}
else if (start_brace == BRACE_AT_START &&
lookfor_cpp_namespace) /* '{' is at start */
{
lookfor_cpp_namespace = TRUE;
}
else
{
if (start_brace == BRACE_AT_END) /* '{' is at end of line */
{
amount += ind_open_imag;
l = skipwhite(ml_get_curline());
if (cin_is_cpp_namespace(l))
amount += ind_cpp_namespace;
}
else
{
/* Compensate for adding ind_open_extra later. */
@@ -7117,6 +7222,46 @@ get_c_indent()
else
amount += ind_continuation;
}
else if (lookfor_cpp_namespace)
{
if (curwin->w_cursor.lnum == ourscope)
continue;
if (curwin->w_cursor.lnum == 0
|| curwin->w_cursor.lnum
< ourscope - FIND_NAMESPACE_LIM)
break;
l = ml_get_curline();
/*
* If we're in a comment now, skip to the start of the
* comment.
*/
trypos = find_start_comment(ind_maxcomment);
if (trypos != NULL)
{
curwin->w_cursor.lnum = trypos->lnum + 1;
curwin->w_cursor.col = 0;
continue;
}
/*
* Skip preprocessor directives and blank lines.
*/
if (cin_ispreproc_cont(&l, &curwin->w_cursor.lnum))
continue;
if (cin_is_cpp_namespace(l))
{
amount += ind_cpp_namespace;
break;
}
if (cin_nocode(l))
continue;
}
else if (lookfor != LOOKFOR_TERM
&& lookfor != LOOKFOR_CPP_BASECLASS)
{
@@ -7507,17 +7652,25 @@ get_c_indent()
/*
* When searching for a terminated line, don't use the
* one between the "if" and the "else".
* one between the "if" and the matching "else".
* Need to use the scope of this "else". XXX
* If whilelevel != 0 continue looking for a "do {".
*/
if (cin_iselse(l)
&& whilelevel == 0
&& ((trypos = find_start_brace(ind_maxcomment))
== NULL
if (cin_iselse(l) && whilelevel == 0)
{
/* If we're looking at "} else", let's make sure we
* find the opening brace of the enclosing scope,
* not the one from "if () {". */
if (*l == '}')
curwin->w_cursor.col =
(colnr_T)(l - ml_get_curline()) + 1;
if ((trypos = find_start_brace(ind_maxcomment))
== NULL
|| find_match(LOOKFOR_IF, trypos->lnum,
ind_maxparen, ind_maxcomment) == FAIL))
break;
ind_maxparen, ind_maxcomment) == FAIL)
break;
}
}
/*
src/normal.c
+10 -1
View File
@@ -1202,7 +1202,16 @@ getcount:
{
clearop(oap);
#ifdef FEAT_EVAL
set_reg_var('"');
{
int regname = 0;
/* Adjust the register according to 'clipboard', so that when
* "unnamed" is present it becomes '*' or '+' instead of '"'. */
# ifdef FEAT_CLIPBOARD
adjust_clip_reg(&regname);
# endif
set_reg_var(regname);
}
#endif
}
src/option.c
+1 -22
View File
@@ -143,9 +143,6 @@
#define PV_MMTA OPT_BUF(BV_MMTA)
#endif
#define PV_NF OPT_BUF(BV_NF)
#ifdef FEAT_OSFILETYPE
# define PV_OFT OPT_BUF(BV_OFT)
#endif
#ifdef FEAT_COMPL_FUNC
# define PV_OFU OPT_BUF(BV_OFU)
#endif
@@ -343,9 +340,6 @@ static int p_mmta;
static int p_mod;
static char_u *p_mps;
static char_u *p_nf;
#ifdef FEAT_OSFILETYPE
static char_u *p_oft;
#endif
static int p_pi;
#ifdef FEAT_TEXTOBJ
static char_u *p_qe;
@@ -1939,14 +1933,8 @@ static struct vimoption
(char_u *)NULL, PV_NONE,
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
{"osfiletype", "oft", P_STRING|P_ALLOCED|P_VI_DEF,
#ifdef FEAT_OSFILETYPE
(char_u *)&p_oft, PV_OFT,
{(char_u *)DFLT_OFT, (char_u *)0L}
#else
(char_u *)NULL, PV_NONE,
{(char_u *)0L, (char_u *)0L}
#endif
SCRIPTID_INIT},
{(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
{"paragraphs", "para", P_STRING|P_VI_DEF,
(char_u *)&p_para, PV_NONE,
{(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp",
@@ -5352,9 +5340,6 @@ check_buf_options(buf)
#ifdef FEAT_AUTOCMD
check_string_option(&buf->b_p_ft);
#endif
#ifdef FEAT_OSFILETYPE
check_string_option(&buf->b_p_oft);
#endif
#if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
check_string_option(&buf->b_p_cinw);
#endif
@@ -9804,9 +9789,6 @@ get_varp(p)
case PV_MA: return (char_u *)&(curbuf->b_p_ma);
case PV_MOD: return (char_u *)&(curbuf->b_changed);
case PV_NF: return (char_u *)&(curbuf->b_p_nf);
#ifdef FEAT_OSFILETYPE
case PV_OFT: return (char_u *)&(curbuf->b_p_oft);
#endif
case PV_PI: return (char_u *)&(curbuf->b_p_pi);
#ifdef FEAT_TEXTOBJ
case PV_QE: return (char_u *)&(curbuf->b_p_qe);
@@ -10156,9 +10138,6 @@ buf_copy_options(buf, flags)
#ifdef FEAT_AUTOCMD
/* Don't copy 'filetype', it must be detected */
buf->b_p_ft = empty_option;
#endif
#ifdef FEAT_OSFILETYPE
buf->b_p_oft = vim_strsave(p_oft);
#endif
buf->b_p_pi = p_pi;
#if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
src/option.h
-3
View File
@@ -1002,9 +1002,6 @@ enum
, BV_MMTA
#endif
, BV_NF
#ifdef FEAT_OSFILETYPE
, BV_OFT
#endif
#ifdef FEAT_COMPL_FUNC
, BV_OFU
#endif
src/os_riscos.c
-1292
View File
File diff suppressed because it is too large Load Diff
src/os_riscos.h
-166
View File
@@ -1,166 +0,0 @@
/* vi:set ts=8 sts=4 sw=4:
*
* VIM - Vi IMproved by Bram Moolenaar
*
* Do ":help uganda" in Vim to read copying and usage conditions.
* Do ":help credits" in Vim to see a list of people who contributed.
*/
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <termios.h>
#include <stdlib.h>
#include <unixlib/local.h>
#include <errno.h>
#include <fcntl.h>
#define CASE_INSENSITIVE_FILENAME
#define FEAT_MODIFY_FNAME
#define FEAT_OSFILETYPE
#define DFLT_OFT "Text"
#define USE_TERM_CONSOLE
#define HAVE_AVAIL_MEM
/* Longer filenames now accessible to all */
#ifndef BASENAMELEN
# define BASENAMELEN 64 /* Same length as unzip */
#endif
#ifndef TEMNAME
# define TEMPNAME "<Wimp$ScrapDir>.v?XXXXXX"
# define TEMPNAMELEN 25
#endif
#ifndef DFLT_HELPFILE
# define DFLT_HELPFILE "Vim:doc.help"
#endif
#ifndef DFLT_BDIR
# define DFLT_BDIR ".,<Wimp$ScrapDir>." /* default for 'backupdir' */
#endif
/* Paths to try putting swap file in. */
#ifndef DFLT_DIR
# define DFLT_DIR "<Wimp$ScrapDir>.,." /* default for 'directory' */
#endif
#ifndef DFLT_VDIR
# define DFLT_VDIR "Choices:Vim.view" /* default for 'viewdir' */
#endif
#ifndef TERMCAPFILE
# define TERMCAPFILE "Vim:TermCap"
#endif
#define HAVE_TGETENT
#ifndef SYNTAX_FNAME
# define SYNTAX_FNAME "Vim:Syntax.%s"
#endif
#ifndef EVIM_FILE
# define EVIM_FILE "Vim:Evim"
#endif
#define FEAT_VIMINFO
#ifndef VIMINFO_FILE
# define VIMINFO_FILE "<Choices$Write>.Vim.VimInfo"
#endif
#ifndef VIMINFO_FILE2
# define VIMINFO_FILE2 "Choices:Vim.VimInfo"
#endif
#ifndef VIMRC_FILE
# define VIMRC_FILE "/vimrc"
#endif
#ifndef EXRC_FILE
# define EXRC_FILE "/exrc"
#endif
#ifndef GVIMRC_FILE
# define GVIMRC_FILE "/gvimrc"
#endif
#ifndef USR_VIMRC_FILE
# define USR_VIMRC_FILE "Vim:Evim"
#endif
#ifndef SESSION_FILE
# define SESSION_FILE "/Session.vim"
#endif
#ifndef USR_VIMRC_FILE
# define USR_VIMRC_FILE "Choices:Vim.VimRC"
#endif
#ifndef USR_GVIMRC_FILE
# define USR_GVIMRC_FILE "Choices:Vim.GVimRC"
#endif
#ifndef USR_EXRC_FILE
# define USR_EXRC_FILE "Choices:Vim.ExRC"
#endif
#ifndef SYS_VIMRC_FILE
# define SYS_VIMRC_FILE "Vim:VimRC"
#endif
#ifndef SYS_GVIMRC_FILE
# define SYS_GVIMRC_FILE "Vim:GVimRC"
#endif
#ifndef SYS_MENU_FILE
# define SYS_MENU_FILE "Vim:Menu"
#endif
#ifndef SYS_OPTWIN_FILE
# define SYS_OPTWIN_FILE "Vim:Optwin"
#endif
#ifndef FILETYPE_FILE
# define FILETYPE_FILE "Vim:Filetype"
#endif
#ifndef FTPLUGIN_FILE
# define FTPLUGIN_FILE "Vim:Ftplugin/vim"
#endif
#ifndef INDENT_FILE
# define INDENT_FILE "Vim:Indent/vim"
#endif
#ifndef FTOFF_FILE
# define FTOFF_FILE "Vim:Ftoff"
#endif
#ifndef FTPLUGOF_FILE
# define FTPLUGOF_FILE "Vim:Ftplugof"
#endif
#ifndef INDOFF_FILE
# define INDOFF_FILE "Vim:Indoff"
#endif
#define DFLT_ERRORFILE "errors/vim"
#define DFLT_RUNTIMEPATH "Choices:Vim,Vim:,Choices:Vim.after"
/*
* RISC PCs have plenty of memory, use large buffers
*/
#define CMDBUFFSIZE 1024 /* size of the command processing buffer */
#define MAXPATHL 256 /* paths are always quite short though */
#ifndef DFLT_MAXMEM
# define DFLT_MAXMEM (5*1024) /* use up to 5 Mbyte for a buffer */
#endif
#ifndef DFLT_MAXMEMTOT
# define DFLT_MAXMEMTOT (10*1024) /* use up to 10 Mbyte for Vim */
#endif
#ifdef HAVE_SIGSET
# define signal sigset
#endif
#define n_flag (1<<31)
#define z_flag (1<<30)
#define c_flag (1<<29)
#define v_flag (1<<28)
/* These take r0-r7 as inputs, returns r0-r7 in global variables. */
void swi(int swinum, ...); /* Handles errors itself */
int xswi(int swinum, ...); /* Returns errors using v flag */
extern int r0, r1, r2, r3, r4, r5, r6, r7; /* For return values */
#include <kernel.h>
#include <swis.h>
#define mch_memmove(to, from, len) memmove((char *)(to), (char *)(from), len)
#define mch_rename(src, dst) rename(src, dst)
#define mch_getenv(x) (char_u *)getenv((char *)x)
#define mch_setenv(name, val, x) setenv(name, val, x)
src/os_win32.c
+23 -1
View File
@@ -3401,6 +3401,7 @@ mch_call_shell(
{
STARTUPINFO si;
PROCESS_INFORMATION pi;
DWORD flags = CREATE_NEW_CONSOLE;
si.cb = sizeof(si);
si.lpReserved = NULL;
@@ -3418,6 +3419,22 @@ mch_call_shell(
si.dwFlags = STARTF_USESHOWWINDOW;
si.wShowWindow = SW_SHOWMINNOACTIVE;
}
else if ((STRNICMP(cmdbase, "/b", 2) == 0)
&& vim_iswhite(cmdbase[2]))
{
cmdbase = skipwhite(cmdbase + 2);
flags = CREATE_NO_WINDOW;
si.dwFlags = STARTF_USESTDHANDLES;
si.hStdInput = CreateFile("\\\\.\\NUL", // File name
GENERIC_READ, // Access flags
0, // Share flags
NULL, // Security att.
OPEN_EXISTING, // Open flags
FILE_ATTRIBUTE_NORMAL, // File att.
NULL); // Temp file
si.hStdOutput = si.hStdInput;
si.hStdError = si.hStdInput;
}
/* When the command is in double quotes, but 'shellxquote' is
* empty, keep the double quotes around the command.
@@ -3445,7 +3462,7 @@ mch_call_shell(
NULL, // Process security attributes
NULL, // Thread security attributes
FALSE, // Inherit handles
CREATE_NEW_CONSOLE, // Creation flags
flags, // Creation flags
NULL, // Environment
NULL, // Current directory
&si, // Startup information
@@ -3458,6 +3475,11 @@ mch_call_shell(
EMSG(_("E371: Command not found"));
#endif
}
if (si.hStdInput != NULL)
{
/* Close the handle to \\.\NUL */
CloseHandle(si.hStdInput);
}
/* Close the handles to the subprocess, so that it goes away */
CloseHandle(pi.hThread);
CloseHandle(pi.hProcess);
src/po/af.po
-16
View File
@@ -1768,19 +1768,6 @@ msgstr "Seleksie"
msgid "Undo"
msgstr "Herroep"
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Kan nie Zap font '%s' laai nie"
msgid "E611: Can't use font %s"
msgstr "E611: Kan nie font %s gebruik nie"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Besig om doodsboodskap aan kindproses te stuur.\n"
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Kan nie venster titel vind nie \"%s\""
@@ -3752,9 +3739,6 @@ msgstr "E244: Ongeldige karakterstelnaam \"%s\" in fontnaam \"%s\""
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Ongeldige karakter '%c' in fontnaam \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Ongeldige 'osfiletype' opsie - gaan Text gebruik"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Dubbel sein, staak\n"
src/po/ca.po
-18
View File
@@ -2076,21 +2076,6 @@ msgstr "Substitueix-les &totes"
msgid "&Undo"
msgstr "&Desfés"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: No s'ha pogut carregar la fosa Zap '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: No es pot utilitzar la fosa %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Enviant un missatge per finalitzar el procés fill.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: No s'ha trobat el títol de finestra \"%s\""
@@ -4282,9 +4267,6 @@ msgstr "E244: Conjunt de car
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Caràcter '%c' il·legal en el tipus \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: L'opció 'osfiletype' no és vàlida - s'usa Text"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: S'ha rebut un doble senyal, sortint\n"
src/po/de.po
-18
View File
@@ -1976,21 +1976,6 @@ msgstr "Ersetze &alles"
msgid "&Undo"
msgstr "&Rückgängig"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Zap-Schriftart '%s' kann nicht geladen werden"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Schriftart %s kann nicht verwendet werden"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Sende Nachricht zum Beenden des Kind-Prozesses.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Kann Fenstertitel \"%s\" nicht finden"
@@ -4169,9 +4154,6 @@ msgstr "E244: Unzul
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Unzulässiges Zeichen '%c' in der Schriftart \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Unzulässige 'osfiletype'-Option - verwende Text"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Doppel-Signal, beenden\n"
src/po/en_GB.po
-8
View File
@@ -139,14 +139,6 @@ msgstr "E614: vim_SelFile: cannot return to current directory"
msgid "E615: vim_SelFile: can't get current directory"
msgstr "E615: vim_SelFile: cannot get current directory"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Cannot load Zap font '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Cannot use font %s"
msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
msgstr ""
"Vim E458: Cannot allocate colourmap entry, some colours may be incorrect"
src/po/eo.po
-19
View File
@@ -2169,21 +2169,6 @@ msgstr "Anstataŭigi ĉi&on"
msgid "&Undo"
msgstr "&Malfari"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Ne eblas ŝargi la tiparon Zap \"%s\""
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Ne eblas uzi tiparon %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Sendas mesaĝon por finigi idan procezon\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Ne eblas trovi titolon de fenestro \"%s\""
@@ -4508,10 +4493,6 @@ msgstr "E244: Nevalida nomo de signaro \"%s\" en nomo de tiparo \"%s\""
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Nevalida signo '%c' en nomo de tiparo \"%s\""
# DP: ĉu traduki Text?
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Nevalida opcio 'osfiletype' - uzas Text"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Duobla signalo, eliranta\n"
src/po/es.po
-22
View File
@@ -2806,24 +2806,6 @@ msgstr "Reemplazar &Todos"
msgid "&Undo"
msgstr "&Deshacer"
#: gui_riscos.c:953
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: No se pudo cargar el tipo de letra de impresión Zap '%s'"
#: gui_riscos.c:1052
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: No se puede usar el tipo de letra de impresión %s"
#: gui_riscos.c:3282
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Enviando mensaje para terminar los procesos dependientes (\"child\").\n"
#: gui_w32.c:1177
#, c-format
msgid "E671: Cannot find window title \"%s\""
@@ -5814,10 +5796,6 @@ msgstr ""
"E245: Carácter '%c' ilegal en el nombre del tipo de letra de\n"
"impresión %s"
#: os_riscos.c:1263
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: La opción \"osfiletype\" no es válida - usando Texto"
#: os_unix.c:1065
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Señal doble, saliendo\n"
src/po/fi.po
-19
View File
@@ -2166,22 +2166,6 @@ msgstr "Korvaa k&aikki"
msgid "&Undo"
msgstr "&Kumoa"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Zap-fontin latause ei onnistu %s"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Ei voi käyttää fonttia %s"
# varmaan SIGTERM, ei SIGKILL tms.
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Lähetetään viestiä lapsiprosessien terminoimiseksi.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Ikkunan otsikkoa ei löydy %s"
@@ -4468,9 +4452,6 @@ msgstr "E244: Virheellinen merkist
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Virheellinen merkki %c fontin nimessä %s"
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Virheellinen osfiletype - käytetään Textiä"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Kaksoissignaali, lopetetaan\n"
src/po/fr.po
-18
View File
@@ -2376,21 +2376,6 @@ msgstr "Rempl&acer tout"
msgid "&Undo"
msgstr "Ann&uler"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Impossible de charger la police Zap '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Impossible d'utiliser la police %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Envoi d'un message pour interrompre le processus fils.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Titre de fenêtre \"%s\" introuvable"
@@ -4752,9 +4737,6 @@ msgstr "E244: Jeu de caract
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Caractère '%c' invalide dans le nom de fonte \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Option 'osfiletype' invalide - Text est utilisé"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim : Double signal, sortie\n"
src/po/ga.po
-18
View File
@@ -2140,21 +2140,6 @@ msgstr "Ionadaigh &Uile"
msgid "&Undo"
msgstr "&Cealaigh"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Ní féidir an chlófhoireann Zap '%s' a luchtú"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Ní féidir an chlófhoireann %s a úsáid"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Ag seoladh teachtaireachta chun an macphróiseas a stopadh.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Ní féidir teideal na fuinneoige \"%s\" a aimsiú"
@@ -4476,9 +4461,6 @@ msgstr ""
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Carachtar neamhcheadaithe '%c' mar pháirt d'ainm cló \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Rogha neamhbhailí 'osfiletype' - ag baint úsáid as `Text'"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Comhartha dúbailte, ag scor\n"
src/po/it.po
-18
View File
@@ -2181,21 +2181,6 @@ msgstr "&A Sostituisci Tutto"
msgid "&Undo"
msgstr "&U Disfa"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Non riesco a caricare il font Zap '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Non riesco a usare il font %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Spedisco un messaggio per terminare il processo figlio.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Non trovo il titolo della finestra \"%s\""
@@ -4533,9 +4518,6 @@ msgstr "E244: Nome di charset non ammesso \"%s\" nel fonte di nome \"%s\""
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Carattere non ammesso '%c' nel font di nome \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Opzione 'osfiletype' non valida - uso 'Text'"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Segnale doppio, esco\n"
src/po/ja.po
-18
View File
@@ -2150,21 +2150,6 @@ msgstr "
msgid "&Undo"
msgstr "アンドゥ(&U)"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Zapフォント '%s' を読込めません"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: フォント %s を使用できません"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"子プロセスへ停止メッセージを送信中です.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: タイトルが \"%s\" のウィンドウはみつかりません"
@@ -4469,9 +4454,6 @@ msgstr "E244: ʸ
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: '%c' は不正な文字です (フォント名 \"%s\")"
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: 無効な 'osfiletype' オプション - \"Text\" を使います"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: 2重のシグナルのため, 終了します\n"
src/po/ja.sjis.po
-18
View File
@@ -2150,21 +2150,6 @@ msgstr "
msgid "&Undo"
msgstr "アンドゥ(&U)"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Zapフォント '%s' を読込めません"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: フォント %s を使用できません"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"子プロセスへ停止メッセージを送信中です.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: タイトルが \"%s\" のウィンドウはみつかりません"
@@ -4469,9 +4454,6 @@ msgstr "E244:
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: '%c' は不正な文字です (フォント名 \"%s\")"
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: 無効な 'osfiletype' オプション - \"Text\" を使います"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: 2重のシグナルのため, 終了します\n"
src/po/ko.UTF-8.po
-18
View File
@@ -2134,21 +2134,6 @@ msgstr "모두 바꾸기(&A)"
msgid "&Undo"
msgstr "취소(&U)"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Zap 글꼴 '%s'을(를) 로드할 수 없습니다"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: 글꼴 %s을(를) 사용할 수 없습니다"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"자식 프로세스를 끝내기 위해 메시지를 보냈습니다.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: 창 제목 \"%s\"을(를) 찾을 수 없습니다"
@@ -4426,9 +4411,6 @@ msgstr "E244: 잘못된 글자셋 이름 \"%s\"이(가) 글꼴 이름 \"%s\"에
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: 잘못된 글자 '%c'이(가) 글꼴 이름 \"%s\"에 있습니다"
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: 잘못된 'osfiletype' 옵션 - Text를 사용합니다"
msgid "Vim: Double signal, exiting\n"
msgstr "빔: 같은 시그널 두 번, 끝냅니다\n"
src/po/ko.po
-18
View File
@@ -2134,21 +2134,6 @@ msgstr "
msgid "&Undo"
msgstr "취소(&U)"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Zap 글꼴 '%s'을(를) 로드할 수 없습니다"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: 글꼴 %s을(를) 사용할 수 없습니다"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"자식 프로세스를 끝내기 위해 메시지를 보냈습니다.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: 창 제목 \"%s\"을(를) 찾을 수 없습니다"
@@ -4426,9 +4411,6 @@ msgstr "E244:
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: 잘못된 글자 '%c'이(가) 글꼴 이름 \"%s\"에 있습니다"
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: 잘못된 'osfiletype' 옵션 - Text를 사용합니다"
msgid "Vim: Double signal, exiting\n"
msgstr "빔: 같은 시그널 두 번, 끝냅니다\n"
src/po/nb.po
-18
View File
@@ -2069,21 +2069,6 @@ msgstr "Erstatt &alle"
msgid "&Undo"
msgstr "&Angre"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Kan ikke laste Zap-skrifttype '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Kan ikke bruke skrifttype %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Sender beskjed om å avslutte barneprosess.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Fant ikke vindutittel \"%s\""
@@ -4324,9 +4309,6 @@ msgstr "E244: Ulovlig navn p
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Ulovlig tegn '%c' i skrifttypenavn \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Ugyldig 'osfiletype'-valg - bruker Text"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Dobbelt signal, avslutter\n"
src/po/no.po
-18
View File
@@ -2069,21 +2069,6 @@ msgstr "Erstatt &alle"
msgid "&Undo"
msgstr "&Angre"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Kan ikke laste Zap-skrifttype '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Kan ikke bruke skrifttype %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Sender beskjed om å avslutte barneprosess.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Fant ikke vindutittel \"%s\""
@@ -4324,9 +4309,6 @@ msgstr "E244: Ulovlig navn p
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Ulovlig tegn '%c' i skrifttypenavn \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Ugyldig 'osfiletype'-valg - bruker Text"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Dobbelt signal, avslutter\n"
src/po/pl.UTF-8.po
-18
View File
@@ -2146,21 +2146,6 @@ msgstr "Zamień &wszystko"
msgid "&Undo"
msgstr "&Cofnij"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Nie mogę załadować czcionki Zap '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Nie mogę użyć czcionki %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Wysyłam zawiadomienie kończące proces pochodny.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Nie mogę znaleźć tytułu okna \"%s\""
@@ -4472,9 +4457,6 @@ msgstr ""
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Niedozwolony znak '%c' w nazwie czcionki \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Niewłaściwa opcja 'osfiletype' - używam Text"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Podwójny sygnał, wychodzę\n"
src/po/pl.cp1250.po
-18
View File
@@ -2146,21 +2146,6 @@ msgstr "Zamie
msgid "&Undo"
msgstr "&Cofnij"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Nie mogê za³adowaæ czcionki Zap '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Nie mogê u¿yæ czcionki %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Wysy³am zawiadomienie koñcz¹ce proces pochodny.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Nie mogę znaleźć tytułu okna \"%s\""
@@ -4472,9 +4457,6 @@ msgstr ""
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Niedozwolony znak '%c' w nazwie czcionki \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Niew³aœciwa opcja 'osfiletype' - u¿ywam Text"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Podwójny sygnał, wychodzę\n"
src/po/pl.po
-18
View File
@@ -2146,21 +2146,6 @@ msgstr "Zamie
msgid "&Undo"
msgstr "&Cofnij"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Nie mogê za³adowaæ czcionki Zap '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Nie mogê u¿yæ czcionki %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Wysy³am zawiadomienie koñcz±ce proces pochodny.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Nie mogę znaleźć tytułu okna \"%s\""
@@ -4472,9 +4457,6 @@ msgstr ""
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Niedozwolony znak '%c' w nazwie czcionki \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Niew³a¶ciwa opcja 'osfiletype' - u¿ywam Text"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Podwójny sygnał, wychodzę\n"
src/po/pt_BR.po
-18
View File
@@ -2097,21 +2097,6 @@ msgstr "Substituir &todas"
msgid "&Undo"
msgstr "&Desfazer"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Impossível carregar a fonte Zap '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Impossível usar a fonte %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Enviando mensagem para terminar processo-filho.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Impossível encontrar janela de título \"%s\""
@@ -4342,9 +4327,6 @@ msgstr "E244: Conjunto de caracteres \"%s\" inv
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Caractere '%c' inválido no nome da fonte \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Valor inválido para 'osfiletype' - usando Text"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Sinal duplo, saindo\n"
src/po/ru.cp1251.po
-18
View File
@@ -1790,21 +1790,6 @@ msgstr "
msgid "Undo"
msgstr "Отмена"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Невозможно загрузить шрифт Zap '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Невозможно использовать шрифт %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Отправка сообщения для уничтожения процесса-потомка.\n"
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Окно с заголовком \"%s\" не обнаружено"
@@ -3816,9 +3801,6 @@ msgstr "E244:
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Недопустимый символ '%c' в имени шрифта \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Недопустимое значение опции 'osfiletype' -- используется Text"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Двойной сигнал, завершение работы\n"
src/po/ru.po
-18
View File
@@ -1790,21 +1790,6 @@ msgstr "Выделение"
msgid "Undo"
msgstr "Отмена"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Невозможно загрузить шрифт Zap '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Невозможно использовать шрифт %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Отправка сообщения для уничтожения процесса-потомка.\n"
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Окно с заголовком \"%s\" не обнаружено"
@@ -3816,9 +3801,6 @@ msgstr "E244: Недопустимое имя кодировки \"%s\" в им
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Недопустимый символ '%c' в имени шрифта \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Недопустимое значение опции 'osfiletype' -- используется Text"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Двойной сигнал, завершение работы\n"
src/po/sk.cp1250.po
-16
View File
@@ -1908,19 +1908,6 @@ msgstr "Nahradi
msgid "&Undo"
msgstr "&Spä�"
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Nemôžem naèíta� chybný font '%s'"
msgid "E611: Can't use font %s"
msgstr "E611: Nedá sa použí� písmo %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Posielam správu na ukonèenie synovského procesu.\n"
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Nemožno nájs� okno s titulkom \"%s\""
@@ -4095,9 +4082,6 @@ msgstr "E244: Chybn
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Chybný znak '%c' v názve písma \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Chybná 'osfiletype' vo¾ba - použitie Textu"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: dvojitý signál, konèím\n"
src/po/sk.po
-16
View File
@@ -1908,19 +1908,6 @@ msgstr "Nahradi
msgid "&Undo"
msgstr "&Spä»"
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Nemô¾em naèíta» chybný font '%s'"
msgid "E611: Can't use font %s"
msgstr "E611: Nedá sa pou¾í» písmo %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Posielam správu na ukonèenie synovského procesu.\n"
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Nemo¾no nájs» okno s titulkom \"%s\""
@@ -4095,9 +4082,6 @@ msgstr "E244: Chybn
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Chybný znak '%c' v názve písma \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Chybná 'osfiletype' voµba - pou¾itie Textu"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: dvojitý signál, konèím\n"
src/po/sv.po
-18
View File
@@ -2037,21 +2037,6 @@ msgstr "Ers
msgid "&Undo"
msgstr "&Ångra"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Kan inte läsa in Zap-typsnitt '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Kan inte använda typsnitt %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Skickar meddelande för att avsluta barnprocess.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Kan inte hitta fönstertitel \"%s\""
@@ -4303,9 +4288,6 @@ msgstr "E244: Otill
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Otillåtet tecken '%c' i typsnittsnamn \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Ogiltig 'osfiletype'-flagga - använder Text"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Dubbelsignal, avslutar\n"
src/po/uk.cp1251.po
-21
View File
@@ -2198,23 +2198,6 @@ msgstr "&A:
msgid "&Undo"
msgstr "&U:Ñêàñóâàòè"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Íå âäàëîñÿ çàâàíòàæèòè øðèôò Zap '%s'"
# msgstr "E235: "
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Íå âäàëîñÿ âèêîðèñòàòè øðèôò %s"
# msgstr "E242: "
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Ïîñèëàºòüñÿ ïîâ³äîìëåííÿ ùîá ïðèïèíèòè äî÷³ðí³é ïðîöåñ.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Íå âäàëîñÿ çíàéòè â³êíî \"%s\""
@@ -4590,10 +4573,6 @@ msgstr "E244:
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Ïîìèëêîâèé ñèìâîë %c â íàçâ³ øðèôòó \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Íåïðàâèëüíà îïö³ÿ 'osfiletype' -- áóäå `Text'"
# msgstr "E366: "
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Äâ³÷³ îòðèìàíî ñèãíàë, âèõ³ä\n"
src/po/uk.po
-21
View File
@@ -2198,23 +2198,6 @@ msgstr "&A:Замінити усі"
msgid "&Undo"
msgstr "&U:Скасувати"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Не вдалося завантажити шрифт Zap '%s'"
# msgstr "E235: "
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Не вдалося використати шрифт %s"
# msgstr "E242: "
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Посилається повідомлення щоб припинити дочірній процес.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Не вдалося знайти вікно \"%s\""
@@ -4590,10 +4573,6 @@ msgstr "E244: Некоректна назва набору символів \"%s
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Помилковий символ %c в назві шрифту \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Неправильна опція 'osfiletype' -- буде `Text'"
# msgstr "E366: "
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Двічі отримано сигнал, вихід\n"
src/po/vi.po
-18
View File
@@ -1784,21 +1784,6 @@ msgstr "Lựa chọn"
msgid "Undo"
msgstr "Hủy thao tác"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Không nạp được phông chữ Zap '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: Không sử dụng được phông chữ %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"Gửi thông báo để \"hủy diệt\" (dừng) tiến trình con.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: Không tìm được tiêu đề cửa sổ \"%s\""
@@ -3801,9 +3786,6 @@ msgstr "E244: Tên bảng mã không cho phép \"%s\" trong tên phông chữ \"
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: Ký tự không cho phép '%c' trong tên phông chữ \"%s\""
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: Giá trị tùy chọn 'osfiletype' không cho phép - sử dụng Text"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Tín hiệu đôi, thoát\n"
src/po/zh_CN.UTF-8.po
-18
View File
@@ -2015,21 +2015,6 @@ msgstr "全部替换(&A)"
msgid "&Undo"
msgstr "撤销(&U)"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: 无法加载 Zap 字体 '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: 无法使用字体 %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"正在发送消息终止子进程。\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: 找不到窗口标题 \"%s\""
@@ -4226,9 +4211,6 @@ msgstr "E244: 字符集 \"%s\" 不能对应字体\"%s\""
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: 不正确的字符 '%c' 出现在字体名称 \"%s\" 内"
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: 不正确的 'osfiletype' 选项 - 使用纯文字模式"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: 双重信号，退出中\n"
src/po/zh_CN.cp936.po
-18
View File
@@ -2015,21 +2015,6 @@ msgstr "ȫ
msgid "&Undo"
msgstr "撤销(&U)"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: 无法加载 Zap 字体 '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: 无法使用字体 %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"正在发送消息终止子进程。\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: 找不到窗口标题 \"%s\""
@@ -4226,9 +4211,6 @@ msgstr "E244:
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: 不正确的字符 '%c' 出现在字体名称 \"%s\" 内"
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: 不正确的 'osfiletype' 选项 - 使用纯文字模式"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: 双重信号，退出中\n"
src/po/zh_CN.po
-18
View File
@@ -2015,21 +2015,6 @@ msgstr "ȫ
msgid "&Undo"
msgstr "撤销(&U)"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: 无法加载 Zap 字体 '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: 无法使用字体 %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"正在发送消息终止子进程。\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: 找不到窗口标题 \"%s\""
@@ -4226,9 +4211,6 @@ msgstr "E244:
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: 不正确的字符 '%c' 出现在字体名称 \"%s\" 内"
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: 不正确的 'osfiletype' 选项 - 使用纯文字模式"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: 双重信号，退出中\n"
src/po/zh_TW.UTF-8.po
-18
View File
@@ -1805,21 +1805,6 @@ msgstr "選擇"
msgid "Undo"
msgstr "復原"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: 無法開啟 Zap 字型 '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: 無法使用字型 %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"送出中斷子程式的訊息中.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: 找不到標題為 \"%s\" 的視窗"
@@ -3785,9 +3770,6 @@ msgstr "E244: 字元集 \"%s\" 無法對應字型\"%s\""
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: 不正確的字元 '%c' 出現在字型名稱 \"%s\" 內"
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: 不正確的 'filetype' 選項 - 使用純文字模式"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: 雙重signal, 離開中\n"
src/po/zh_TW.po
-18
View File
@@ -1798,21 +1798,6 @@ msgstr "
msgid "Undo"
msgstr "復原"
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: 無法開啟 Zap 字型 '%s'"
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: 無法使用字型 %s"
msgid ""
"\n"
"Sending message to terminate child process.\n"
msgstr ""
"\n"
"送出中斷子程式的訊息中.\n"
#, c-format
msgid "E671: Cannot find window title \"%s\""
msgstr "E671: 找不到標題為 \"%s\" 的視窗"
@@ -3778,9 +3763,6 @@ msgstr "E244:
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: 不正確的字元 '%c' 出現在字型名稱 \"%s\" 內"
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: 不正確的 'filetype' 選項 - 使用純文字模式"
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: 雙重signal, 離開中\n"
src/proto.h
-6
View File
@@ -62,9 +62,6 @@ extern int _stricoll __ARGS((char *a, char *b));
# ifdef __BEOS__
# include "os_beos.pro"
# endif
# ifdef RISCOS
# include "os_riscos.pro"
# endif
# ifdef __QNX__
# include "os_qnx.pro"
# endif
@@ -248,9 +245,6 @@ extern char *vim_SelFile __ARGS((Widget toplevel, char *prompt, char *init_path,
# ifdef FEAT_GUI_X11
# include "gui_x11.pro"
# endif
# ifdef RISCOS
# include "gui_riscos.pro"
# endif
# ifdef FEAT_GUI_PHOTON
# include "gui_photon.pro"
# endif
src/proto/ex_cmds2.pro
+2
View File
@@ -83,5 +83,7 @@ void ex_checktime __ARGS((exarg_T *eap));
char_u *get_mess_lang __ARGS((void));
void set_lang_var __ARGS((void));
void ex_language __ARGS((exarg_T *eap));
void free_locales __ARGS((void));
char_u *get_lang_arg __ARGS((expand_T *xp, int idx));
char_u *get_locales __ARGS((expand_T *xp, int idx));
/* vim: set ft=c : */
src/proto/ex_getln.pro
+1 -1
View File
@@ -31,7 +31,7 @@ char_u *sm_gettail __ARGS((char_u *s));
char_u *addstar __ARGS((char_u *fname, int len, int context));
void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
int expand_cmdline __ARGS((expand_T *xp, char_u *str, int col, int *matchcount, char_u ***matches));
int ExpandGeneric __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file, char_u *((*func)(expand_T *, int))));
int ExpandGeneric __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file, char_u *((*func)(expand_T *, int)), int escaped));
char_u *globpath __ARGS((char_u *path, char_u *file, int expand_options));
void init_history __ARGS((void));
int get_histtype __ARGS((char_u *name));
src/proto/gui_riscos.pro
-66
View File
@@ -1,66 +0,0 @@
/* Prototypes for gui_riscos.c
* Based on gui_x11_pro.h (10 March 2002 version)
*/
void gui_mch_prepare __ARGS((int *argc, char **argv));
int gui_mch_init_check __ARGS((void));
int gui_mch_init __ARGS((void));
void gui_mch_uninit __ARGS((void));
void gui_mch_new_colors __ARGS((void));
int gui_mch_open __ARGS((void));
void gui_init_tooltip_font __ARGS((void));
void gui_init_menu_font __ARGS((void));void gui_mch_exit __ARGS((int rc));
int gui_mch_get_winpos __ARGS((int *x, int *y));
void gui_mch_set_winpos __ARGS((int x, int y));
void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height));
void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h));
int gui_mch_init_font __ARGS((char_u *font_name, int do_fontset));
GuiFont gui_mch_get_font __ARGS((char_u *name, int giveErrorIfMissing));
int gui_mch_adjust_charheight __ARGS((void));
void gui_mch_set_font __ARGS((GuiFont font));
void gui_mch_set_fontset __ARGS((GuiFontset fontset));
void gui_mch_free_font __ARGS((GuiFont font));
void gui_mch_free_fontset __ARGS((GuiFontset fontset));
GuiFontset gui_mch_get_fontset __ARGS((char_u *name, int giveErrorIfMissing, int fixed_width));
guicolor_T gui_mch_get_color __ARGS((char_u *reqname));
void gui_mch_set_fg_color __ARGS((guicolor_T color));
void gui_mch_set_bg_color __ARGS((guicolor_T color));
void gui_mch_draw_string __ARGS((int row, int col, char_u *s, int len, int flags));
int gui_mch_haskey __ARGS((char_u *name));
void gui_mch_beep __ARGS((void));
void gui_mch_flash __ARGS((int msec));
void gui_mch_invert_rectangle __ARGS((int r, int c, int nr, int nc));
void gui_mch_iconify __ARGS((void));
void gui_mch_set_foreground __ARGS((void));
void gui_mch_draw_hollow_cursor __ARGS((guicolor_T color));
void gui_mch_draw_part_cursor __ARGS((int w, int h, guicolor_T color));
void gui_mch_update __ARGS((void));
int gui_mch_wait_for_chars __ARGS((long wtime));
void gui_mch_flush __ARGS((void));
void gui_mch_clear_block __ARGS((int row1, int col1, int row2, int col2));
void gui_mch_clear_all __ARGS((void));
void gui_mch_delete_lines __ARGS((int row, int num_lines));
void gui_mch_insert_lines __ARGS((int row, int num_lines));
void clip_mch_lose_selection __ARGS((VimClipboard *cbd));
int clip_mch_own_selection __ARGS((VimClipboard *cbd));
void clip_mch_request_selection __ARGS((VimClipboard *cbd));
void clip_mch_set_selection __ARGS((VimClipboard *cbd));
void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
void gui_mch_menu_hidden __ARGS((vimmenu_T *menu, int hidden));
void gui_mch_draw_menubar __ARGS((void));
void gui_mch_set_blinking __ARGS((long waittime, long on, long off));
void gui_mch_stop_blink __ARGS((void));
void gui_mch_start_blink __ARGS((void));
void process_event __ARGS((int event, int *block));
void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
long_u gui_mch_get_rgb __ARGS((guicolor_T pixel));
void gui_mch_getmouse __ARGS((int *x, int *y));
void gui_mch_setmouse __ARGS((int x, int y));
void gui_mch_drawsign __ARGS((int row, int col, int typenr));
void gui_mch_destroy_sign __ARGS((XImage *sign));
void gui_mch_mousehide __ARGS((int hide));
void mch_set_mouse_shape __ARGS((int shape));
void gui_mch_menu_set_tip __ARGS((vimmenu_T *menu));
void ro_redraw_title __ARGS((int window));
int ro_ok_to_quit __ARGS((void));
/* vim: set ft=c : */
src/proto/os_riscos.pro
-49
View File
@@ -1,49 +0,0 @@
/* os_riscos.c */
void mch_write __ARGS((char_u *s, int len));
int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt));
int mch_char_avail __ARGS((void));
long_u mch_avail_mem __ARGS((int special));
void mch_delay __ARGS((long msec, int ignoreinput));
void mch_suspend __ARGS((void));
void mch_init __ARGS((void));
int mch_check_win __ARGS((int argc, char **argv));
int mch_input_isatty __ARGS((void));
int mch_can_restore_title __ARGS((void));
int mch_can_restore_icon __ARGS((void));
void mch_settitle __ARGS((char_u *title, char_u *icon));
void mch_restore_title __ARGS((int which));
int mch_get_user_name __ARGS((char_u *s, int len));
void mch_get_host_name __ARGS((char_u *s, int len));
long mch_get_pid __ARGS((void));
int mch_dirname __ARGS((char_u *buf, int len));
int mch_FullName __ARGS((char_u *fname, char_u *buf, int len, int force));
int mch_isFullName __ARGS((char_u *fname));
long mch_getperm __ARGS((char_u *name));
int mch_setperm __ARGS((char_u *name, long perm));
void mch_hide __ARGS((char_u *name));
int mch_isdir __ARGS((char_u *name));
int mch_can_exe __ARGS((char_u *name));
int mch_nodetype __ARGS((char_u *name));
void mch_early_init __ARGS((void));
void mch_exit __ARGS((int r));
void mch_settmode __ARGS((int tmode));
void mch_setmouse __ARGS((int on));
int mch_screenmode __ARGS((char_u *arg));
int mch_get_shellsize __ARGS((void));
void mch_set_shellsize __ARGS((void));
void mch_new_shellsize __ARGS((void));
int mch_call_shell __ARGS((char_u *cmd, int options));
void mch_breakcheck __ARGS((void));
int mch_expandpath __ARGS((garray_T *gap, char_u *path, int flags));
int expand_section __ARGS((garray_T *gap, char_u *root, char_u *rest, int flags));
int mch_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
int mch_has_exp_wildcard __ARGS((char_u *p));
int mch_has_wildcard __ARGS((char_u *p));
int mch_remove __ARGS((char_u *file));
char_u *mch_munge_fname __ARGS((char_u *fname));
int ro_buflist_add __ARGS((char_u *old_name));
int mch_chdir __ARGS((char_u *dir));
void mch_read_filetype __ARGS((char_u *file));
void mch_set_filetype __ARGS((char_u *file, char_u *type));
int mch_check_filetype __ARGS((char_u *fname, char_u *type));
/* vim: set ft=c : */

Some files were not shown because too many files have changed in this diff Show More