mirror of
https://github.com/vim/vim
synced 2025-07-16 01:01:58 +00:00
updated for version 7.0061
This commit is contained in:
Bram Moolenaar
@ -254,10 +254,22 @@ HTMLS = \
|
||||
windows.html \
|
||||
workshop.html
|
||||
|
||||
CONVERTED = \
|
||||
vim-it.UTF-8.1 \
|
||||
evim-it.UTF-8.1 \
|
||||
vimdiff-it.UTF-8.1 \
|
||||
vimtutor-it.UTF-8.1 \
|
||||
xxd-it.UTF-8.1 \
|
||||
vim-ru.UTF-8.1 \
|
||||
evim-ru.UTF-8.1 \
|
||||
vimdiff-ru.UTF-8.1 \
|
||||
vimtutor-ru.UTF-8.1 \
|
||||
xxd-ru.UTF-8.1 \
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .c .o .txt .html
|
||||
|
||||
all: tags vim.man vimdiff.man vimtutor.man xxd.man
|
||||
all: tags vim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
|
||||
|
||||
# Use Vim to generate the tags file. Can only be used when Vim has been
|
||||
# compiled and installed. Supports multiple languages.
|
||||
@ -365,3 +377,33 @@ os_risc.txt:
|
||||
|
||||
os_win32.txt:
|
||||
touch os_win32.txt
|
||||
|
||||
vim-it.UTF-8.1: vim-it.1
|
||||
iconv -f latin1 -t utf-8 $< >$@
|
||||
|
||||
evim-it.UTF-8.1: evim-it.1
|
||||
iconv -f latin1 -t utf-8 $< >$@
|
||||
|
||||
vimdiff-it.UTF-8.1: vimdiff-it.1
|
||||
iconv -f latin1 -t utf-8 $< >$@
|
||||
|
||||
vimtutor-it.UTF-8.1: vimtutor-it.1
|
||||
iconv -f latin1 -t utf-8 $< >$@
|
||||
|
||||
xxd-it.UTF-8.1: xxd-it.1
|
||||
iconv -f latin1 -t utf-8 $< >$@
|
||||
|
||||
vim-ru.UTF-8.1: vim-ru.1
|
||||
iconv -f KOI8-R -t utf-8 $< >$@
|
||||
|
||||
evim-ru.UTF-8.1: evim-ru.1
|
||||
iconv -f KOI8-R -t utf-8 $< >$@
|
||||
|
||||
vimdiff-ru.UTF-8.1: vimdiff-ru.1
|
||||
iconv -f KOI8-R -t utf-8 $< >$@
|
||||
|
||||
vimtutor-ru.UTF-8.1: vimtutor-ru.1
|
||||
iconv -f KOI8-R -t utf-8 $< >$@
|
||||
|
||||
xxd-ru.UTF-8.1: xxd-ru.1
|
||||
iconv -f KOI8-R -t utf-8 $< >$@
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*change.txt* For Vim version 7.0aa. Last change: 2005 Feb 23
|
||||
*change.txt* For Vim version 7.0aa. Last change: 2005 Mar 16
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@ -1155,13 +1155,17 @@ The next three commands always work on whole lines.
|
||||
compile time.
|
||||
|
||||
*gq*
|
||||
gq{motion} Format the lines that {motion} moves over. The
|
||||
'textwidth' option controls the length of each
|
||||
formatted line (see below). If the 'textwidth' option
|
||||
is 0, the formatted line length is the screen width
|
||||
(with a maximum width of 79). {not in Vi}
|
||||
gq{motion} Format the lines that {motion} moves over.
|
||||
If 'formatprg' is empty formatting is done internally
|
||||
and the 'textwidth' option controls the length of each
|
||||
formatted line (see below).
|
||||
If the 'textwidth' option is 0, the formatted line
|
||||
length is the screen width (with a maximum width of
|
||||
79). {not in Vi}
|
||||
The 'formatoptions' option controls the type of
|
||||
formatting |fo-table|.
|
||||
The cursor is left on the first non-blank of the last
|
||||
formatted line.
|
||||
NOTE: The "Q" command formerly performed this
|
||||
function. If you still want to use "Q" for
|
||||
formatting, use this mapping: >
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
*eval.txt* For Vim version 7.0aa. Last change: 2005 Mar 15
|
||||
*eval.txt* For Vim version 7.0aa. Last change: 2005 Mar 17
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@ -2383,8 +2383,9 @@ getbufvar({expr}, {varname}) *getbufvar()*
|
||||
The result is the value of option or local buffer variable
|
||||
{varname} in buffer {expr}. Note that the name without "b:"
|
||||
must be used.
|
||||
This also works for a global or local window option, but it
|
||||
doesn't work for a global or local window variable.
|
||||
This also works for a global or buffer-local option, but it
|
||||
doesn't work for a global variable, window-local variable or
|
||||
window-local option.
|
||||
For the use of {expr}, see |bufname()| above.
|
||||
When the buffer or variable doesn't exist an empty string is
|
||||
returned, there is no error message.
|
||||
@ -2580,8 +2581,9 @@ getwinposy() The result is a Number, which is the Y coordinate in pixels of
|
||||
getwinvar({nr}, {varname}) *getwinvar()*
|
||||
The result is the value of option or local window variable
|
||||
{varname} in window {nr}.
|
||||
This also works for a global or local buffer option, but it
|
||||
doesn't work for a global or local buffer variable.
|
||||
This also works for a global option, buffer-local option and
|
||||
window-local option, but it doesn't work for a global variable
|
||||
or buffer-local variable.
|
||||
Note that the name without "w:" must be used.
|
||||
Examples: >
|
||||
:let list_is_on = getwinvar(2, '&list')
|
||||
@ -3908,12 +3910,16 @@ taglist({expr}) *taglist()*
|
||||
tool.
|
||||
static a file specific tag. Refer to
|
||||
|static-tag| for more information.
|
||||
More entries may be present, depending on the content of the
|
||||
tags file: access, implementation, inherits and signature.
|
||||
Refer to the ctags documentation for information about these
|
||||
fields. For C code the fields "struct", "class" and "enum"
|
||||
may appear, they give the name of the entity the tag is
|
||||
contained in.
|
||||
The "kind" entry is only available when using Exuberant ctags
|
||||
generated tags file. More entries may be present, depending
|
||||
on the content of the tags file: access, implementation,
|
||||
inherits and signature. Refer to the ctags documentation for
|
||||
information about these fields. For C code the fields
|
||||
"struct", "class" and "enum" may appear, they give the name of
|
||||
the entity the tag is contained in.
|
||||
|
||||
The ex-command 'cmd' can be either an ex search pattern, a
|
||||
line number or a line number followed by a byte number.
|
||||
|
||||
If there are no matching tags, then an empty list is returned.
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ maniera usuale.
|
||||
La modifica file sar<61> molto meno efficiente.
|
||||
.PP
|
||||
.B eview
|
||||
come sopra, ma parte in modalit<69> "Sola Lettura". Funziona come evim -R.
|
||||
come sopra, ma parte in modalit<69> "Sola Lettura". Funziona come evim \-R.
|
||||
.PP
|
||||
Vedere vim(1) per dettagli riguardo a Vim, opzioni, etc.
|
||||
.PP
|
||||
|
||||
@ -21,7 +21,7 @@ Only to be used for people who really can't work with Vim in the normal way.
|
||||
Editing will be much less efficient.
|
||||
.PP
|
||||
.B eview
|
||||
is the same, but starts in read-only mode. It works just like evim -R.
|
||||
is the same, but starts in read-only mode. It works just like evim \-R.
|
||||
.PP
|
||||
See vim(1) for details about Vim, options, etc.
|
||||
.PP
|
||||
|
||||
@ -6459,6 +6459,7 @@ tag-search tagsrch.txt /*tag-search*
|
||||
tag-security tagsrch.txt /*tag-security*
|
||||
tag-skip-file tagsrch.txt /*tag-skip-file*
|
||||
tag-stack tagsrch.txt /*tag-stack*
|
||||
taglist() eval.txt /*taglist()*
|
||||
tags tagsrch.txt /*tags*
|
||||
tags-and-searches tagsrch.txt /*tags-and-searches*
|
||||
tags-file-changed version5.txt /*tags-file-changed*
|
||||
|
||||
@ -7,7 +7,7 @@ vim \- Vi IMproved, a programmers text editor
|
||||
[options] [file ..]
|
||||
.br
|
||||
.B vim
|
||||
[options] -
|
||||
[options] \-
|
||||
.br
|
||||
.B vim
|
||||
[options] \-t tag
|
||||
@ -69,13 +69,13 @@ A list of filenames.
|
||||
The first one will be the current file and read into the buffer.
|
||||
The cursor will be positioned on the first line of the buffer.
|
||||
You can get to the other files with the ":next" command.
|
||||
To edit a file that starts with a dash, precede the filelist with "--".
|
||||
To edit a file that starts with a dash, precede the filelist with "\-\-".
|
||||
.TP
|
||||
-
|
||||
\-
|
||||
The file to edit is read from stdin. Commands are read from stderr, which
|
||||
should be a tty.
|
||||
.TP
|
||||
-t {tag}
|
||||
\-t {tag}
|
||||
The file to edit and the initial cursor position depends on a "tag", a sort
|
||||
of goto label.
|
||||
{tag} is looked up in the tags file, the associated file becomes the current
|
||||
@ -86,7 +86,7 @@ The effect is that the file containing that function becomes the current file
|
||||
and the cursor is positioned on the start of the function.
|
||||
See ":help tag-commands".
|
||||
.TP
|
||||
-q [errorfile]
|
||||
\-q [errorfile]
|
||||
Start in quickFix mode.
|
||||
The file [errorfile] is read and the first error is displayed.
|
||||
If [errorfile] is omitted, the filename is obtained from the 'errorfile'
|
||||
@ -105,27 +105,27 @@ The "normal" way, everything is default.
|
||||
ex
|
||||
Start in Ex mode.
|
||||
Go to Normal mode with the ":vi" command.
|
||||
Can also be done with the "-e" argument.
|
||||
Can also be done with the "\-e" argument.
|
||||
.TP
|
||||
view
|
||||
Start in read-only mode. You will be protected from writing the files. Can
|
||||
also be done with the "-R" argument.
|
||||
also be done with the "\-R" argument.
|
||||
.TP
|
||||
gvim gview
|
||||
The GUI version.
|
||||
Starts a new window.
|
||||
Can also be done with the "-g" argument.
|
||||
Can also be done with the "\-g" argument.
|
||||
.TP
|
||||
evim eview
|
||||
The GUI version in easy mode.
|
||||
Starts a new window.
|
||||
Can also be done with the "-y" argument.
|
||||
Can also be done with the "\-y" argument.
|
||||
.TP
|
||||
rvim rview rgvim rgview
|
||||
Like the above, but with restrictions. It will not be possible to start shell
|
||||
commands, or suspend
|
||||
.B Vim.
|
||||
Can also be done with the "-Z" argument.
|
||||
Can also be done with the "\-Z" argument.
|
||||
.SH OPTIONS
|
||||
The options may be given in any order, before or after filenames.
|
||||
Options without an argument can be combined after a single dash.
|
||||
@ -141,7 +141,7 @@ See ":help search-pattern" for the available search patterns.
|
||||
.TP
|
||||
+{command}
|
||||
.TP
|
||||
-c {command}
|
||||
\-c {command}
|
||||
{command} will be executed after the
|
||||
first file has been read.
|
||||
{command} is interpreted as an Ex command.
|
||||
@ -149,21 +149,21 @@ If the {command} contains spaces it must be enclosed in double quotes (this
|
||||
depends on the shell that is used).
|
||||
Example: Vim "+set si" main.c
|
||||
.br
|
||||
Note: You can use up to 10 "+" or "-c" commands.
|
||||
Note: You can use up to 10 "+" or "\-c" commands.
|
||||
.TP
|
||||
-S {file}
|
||||
\-S {file}
|
||||
{file} will be sourced after the first file has been read.
|
||||
This is equivalent to -c "source {file}".
|
||||
{file} cannot start with '-'.
|
||||
If {file} is omitted "Session.vim" is used (only works when -S is the last
|
||||
This is equivalent to \-c "source {file}".
|
||||
{file} cannot start with '\-'.
|
||||
If {file} is omitted "Session.vim" is used (only works when \-S is the last
|
||||
argument).
|
||||
.TP
|
||||
--cmd {command}
|
||||
Like using "-c", but the command is executed just before
|
||||
\-\-cmd {command}
|
||||
Like using "\-c", but the command is executed just before
|
||||
processing any vimrc file.
|
||||
You can use up to 10 of these commands, independently from "-c" commands.
|
||||
You can use up to 10 of these commands, independently from "\-c" commands.
|
||||
.TP
|
||||
-A
|
||||
\-A
|
||||
If
|
||||
.B Vim
|
||||
has been compiled with ARABIC support for editing right-to-left
|
||||
@ -174,45 +174,45 @@ message is given and
|
||||
.B Vim
|
||||
aborts.
|
||||
.TP
|
||||
-b
|
||||
\-b
|
||||
Binary mode.
|
||||
A few options will be set that makes it possible to edit a binary or
|
||||
executable file.
|
||||
.TP
|
||||
-C
|
||||
\-C
|
||||
Compatible. Set the 'compatible' option.
|
||||
This will make
|
||||
.B Vim
|
||||
behave mostly like Vi, even though a .vimrc file exists.
|
||||
.TP
|
||||
-d
|
||||
\-d
|
||||
Start in diff mode.
|
||||
There should be two or three file name arguments.
|
||||
.B Vim
|
||||
will open all the files and show differences between them.
|
||||
Works like vimdiff(1).
|
||||
.TP
|
||||
-d {device}
|
||||
\-d {device}
|
||||
Open {device} for use as a terminal.
|
||||
Only on the Amiga.
|
||||
Example:
|
||||
"\-d con:20/30/600/150".
|
||||
.TP
|
||||
-D
|
||||
\-D
|
||||
Debugging. Go to debugging mode when executing the first command from a
|
||||
script.
|
||||
.TP
|
||||
-e
|
||||
\-e
|
||||
Start
|
||||
.B Vim
|
||||
in Ex mode, just like the executable was called "ex".
|
||||
.TP
|
||||
-E
|
||||
\-E
|
||||
Start
|
||||
.B Vim
|
||||
in improved Ex mode, just like the executable was called "exim".
|
||||
.TP
|
||||
-f
|
||||
\-f
|
||||
Foreground. For the GUI version,
|
||||
.B Vim
|
||||
will not fork and detach from the shell it was started in.
|
||||
@ -225,12 +225,12 @@ is executed by a program that will wait for the edit
|
||||
session to finish (e.g. mail).
|
||||
On the Amiga the ":sh" and ":!" commands will not work.
|
||||
.TP
|
||||
--nofork
|
||||
\-\-nofork
|
||||
Foreground. For the GUI version,
|
||||
.B Vim
|
||||
will not fork and detach from the shell it was started in.
|
||||
.TP
|
||||
-F
|
||||
\-F
|
||||
If
|
||||
.B Vim
|
||||
has been compiled with FKMAP support for editing right-to-left
|
||||
@ -241,7 +241,7 @@ Otherwise an error message is given and
|
||||
.B Vim
|
||||
aborts.
|
||||
.TP
|
||||
-g
|
||||
\-g
|
||||
If
|
||||
.B Vim
|
||||
has been compiled with GUI support, this option enables the GUI.
|
||||
@ -249,13 +249,13 @@ If no GUI support was compiled in, an error message is given and
|
||||
.B Vim
|
||||
aborts.
|
||||
.TP
|
||||
-h
|
||||
\-h
|
||||
Give a bit of help about the command line arguments and options.
|
||||
After this
|
||||
.B Vim
|
||||
exits.
|
||||
.TP
|
||||
-H
|
||||
\-H
|
||||
If
|
||||
.B Vim
|
||||
has been compiled with RIGHTLEFT support for editing right-to-left
|
||||
@ -266,87 +266,87 @@ Otherwise an error message is given and
|
||||
.B Vim
|
||||
aborts.
|
||||
.TP
|
||||
-i {viminfo}
|
||||
\-i {viminfo}
|
||||
When using the viminfo file is enabled, this option sets the filename to use,
|
||||
instead of the default "~/.viminfo".
|
||||
This can also be used to skip the use of the .viminfo file, by giving the name
|
||||
"NONE".
|
||||
.TP
|
||||
-L
|
||||
Same as -r.
|
||||
\-L
|
||||
Same as \-r.
|
||||
.TP
|
||||
-l
|
||||
\-l
|
||||
Lisp mode.
|
||||
Sets the 'lisp' and 'showmatch' options on.
|
||||
.TP
|
||||
-m
|
||||
\-m
|
||||
Modifying files is disabled.
|
||||
Resets the 'write' option.
|
||||
You can still modify the buffer, but writing a file is not possible.
|
||||
.TP
|
||||
-M
|
||||
\-M
|
||||
Modifications not allowed. The 'modifiable' and 'write' options will be unset,
|
||||
so that changes are not allowed and files can not be written. Note that these
|
||||
options can be set to enable making modifications.
|
||||
.TP
|
||||
-N
|
||||
\-N
|
||||
No-compatible mode. Reset the 'compatible' option.
|
||||
This will make
|
||||
.B Vim
|
||||
behave a bit better, but less Vi compatible, even though a .vimrc file does
|
||||
not exist.
|
||||
.TP
|
||||
-n
|
||||
\-n
|
||||
No swap file will be used.
|
||||
Recovery after a crash will be impossible.
|
||||
Handy if you want to edit a file on a very slow medium (e.g. floppy).
|
||||
Can also be done with ":set uc=0".
|
||||
Can be undone with ":set uc=200".
|
||||
.TP
|
||||
-nb
|
||||
\-nb
|
||||
Become an editor server for NetBeans. See the docs for details.
|
||||
.TP
|
||||
-o[N]
|
||||
\-o[N]
|
||||
Open N windows stacked.
|
||||
When N is omitted, open one window for each file.
|
||||
.TP
|
||||
-O[N]
|
||||
\-O[N]
|
||||
Open N windows side by side.
|
||||
When N is omitted, open one window for each file.
|
||||
.TP
|
||||
-R
|
||||
\-R
|
||||
Read-only mode.
|
||||
The 'readonly' option will be set.
|
||||
You can still edit the buffer, but will be prevented from accidently
|
||||
overwriting a file.
|
||||
If you do want to overwrite a file, add an exclamation mark to the Ex command,
|
||||
as in ":w!".
|
||||
The -R option also implies the -n option (see below).
|
||||
The \-R option also implies the \-n option (see below).
|
||||
The 'readonly' option can be reset with ":set noro".
|
||||
See ":help 'readonly'".
|
||||
.TP
|
||||
-r
|
||||
\-r
|
||||
List swap files, with information about using them for recovery.
|
||||
.TP
|
||||
-r {file}
|
||||
\-r {file}
|
||||
Recovery mode.
|
||||
The swap file is used to recover a crashed editing session.
|
||||
The swap file is a file with the same filename as the text file with ".swp"
|
||||
appended.
|
||||
See ":help recovery".
|
||||
.TP
|
||||
-s
|
||||
Silent mode. Only when started as "Ex" or when the "-e" option was given
|
||||
before the "-s" option.
|
||||
\-s
|
||||
Silent mode. Only when started as "Ex" or when the "\-e" option was given
|
||||
before the "\-s" option.
|
||||
.TP
|
||||
-s {scriptin}
|
||||
\-s {scriptin}
|
||||
The script file {scriptin} is read.
|
||||
The characters in the file are interpreted as if you had typed them.
|
||||
The same can be done with the command ":source! {scriptin}".
|
||||
If the end of the file is reached before the editor exits, further characters
|
||||
are read from the keyboard.
|
||||
.TP
|
||||
-T {terminal}
|
||||
\-T {terminal}
|
||||
Tells
|
||||
.B Vim
|
||||
the name of the terminal you are using.
|
||||
@ -356,49 +356,49 @@ to
|
||||
.B Vim
|
||||
(builtin) or defined in the termcap or terminfo file.
|
||||
.TP
|
||||
-u {vimrc}
|
||||
\-u {vimrc}
|
||||
Use the commands in the file {vimrc} for initializations.
|
||||
All the other initializations are skipped.
|
||||
Use this to edit a special kind of files.
|
||||
It can also be used to skip all initializations by giving the name "NONE".
|
||||
See ":help initialization" within vim for more details.
|
||||
.TP
|
||||
-U {gvimrc}
|
||||
\-U {gvimrc}
|
||||
Use the commands in the file {gvimrc} for GUI initializations.
|
||||
All the other GUI initializations are skipped.
|
||||
It can also be used to skip all GUI initializations by giving the name "NONE".
|
||||
See ":help gui-init" within vim for more details.
|
||||
.TP
|
||||
-V[N]
|
||||
\-V[N]
|
||||
Verbose. Give messages about which files are sourced and for reading and
|
||||
writing a viminfo file. The optional number N is the value for 'verbose'.
|
||||
Default is 10.
|
||||
.TP
|
||||
-v
|
||||
\-v
|
||||
Start
|
||||
.B Vim
|
||||
in Vi mode, just like the executable was called "vi". This only has effect
|
||||
when the executable is called "ex".
|
||||
.TP
|
||||
-w {scriptout}
|
||||
\-w {scriptout}
|
||||
All the characters that you type are recorded in the file
|
||||
{scriptout}, until you exit
|
||||
.B Vim.
|
||||
This is useful if you want to create a script file to be used with "vim -s" or
|
||||
This is useful if you want to create a script file to be used with "vim \-s" or
|
||||
":source!".
|
||||
If the {scriptout} file exists, characters are appended.
|
||||
.TP
|
||||
-W {scriptout}
|
||||
Like -w, but an existing file is overwritten.
|
||||
\-W {scriptout}
|
||||
Like \-w, but an existing file is overwritten.
|
||||
.TP
|
||||
-x
|
||||
\-x
|
||||
Use encryption when writing files. Will prompt for a crypt key.
|
||||
.TP
|
||||
-X
|
||||
\-X
|
||||
Don't connect to the X server. Shortens startup time in a terminal, but the
|
||||
window title and clipboard will not be used.
|
||||
.TP
|
||||
-y
|
||||
\-y
|
||||
Start
|
||||
.B Vim
|
||||
in easy mode, just like the executable was called "evim" or "eview".
|
||||
@ -406,58 +406,58 @@ Makes
|
||||
.B Vim
|
||||
behave like a click-and-type editor.
|
||||
.TP
|
||||
-Z
|
||||
\-Z
|
||||
Restricted mode. Works like the executable starts with "r".
|
||||
.TP
|
||||
--
|
||||
\-\-
|
||||
Denotes the end of the options.
|
||||
Arguments after this will be handled as a file name.
|
||||
This can be used to edit a filename that starts with a '-'.
|
||||
This can be used to edit a filename that starts with a '\-'.
|
||||
.TP
|
||||
--echo-wid
|
||||
\-\-echo\-wid
|
||||
GTK GUI only: Echo the Window ID on stdout.
|
||||
.TP
|
||||
--help
|
||||
Give a help message and exit, just like "-h".
|
||||
\-\-help
|
||||
Give a help message and exit, just like "\-h".
|
||||
.TP
|
||||
--literal
|
||||
\-\-literal
|
||||
Take file name arguments literally, do not expand wildcards. This has no
|
||||
effect on Unix where the shell expands wildcards.
|
||||
.TP
|
||||
--noplugin
|
||||
Skip loading plugins. Implied by -u NONE.
|
||||
\-\-noplugin
|
||||
Skip loading plugins. Implied by \-u NONE.
|
||||
.TP
|
||||
--remote
|
||||
\-\-remote
|
||||
Connect to a Vim server and make it edit the files given in the rest of the
|
||||
arguments. If no server is found a warning is given and the files are edited
|
||||
in the current Vim.
|
||||
.TP
|
||||
--remote-expr {expr}
|
||||
\-\-remote\-expr {expr}
|
||||
Connect to a Vim server, evaluate {expr} in it and print the result on stdout.
|
||||
.TP
|
||||
--remote-send {keys}
|
||||
\-\-remote\-send {keys}
|
||||
Connect to a Vim server and send {keys} to it.
|
||||
.TP
|
||||
--remote-silent
|
||||
As --remote, but without the warning when no server is found.
|
||||
\-\-remote\-silent
|
||||
As \-\-remote, but without the warning when no server is found.
|
||||
.TP
|
||||
--remote-wait
|
||||
As --remote, but Vim does not exit until the files have been edited.
|
||||
\-\-remote\-wait
|
||||
As \-\-remote, but Vim does not exit until the files have been edited.
|
||||
.TP
|
||||
--remote-wait-silent
|
||||
As --remote-wait, but without the warning when no server is found.
|
||||
\-\-remote\-wait\-silent
|
||||
As \-\-remote\-wait, but without the warning when no server is found.
|
||||
.TP
|
||||
--serverlist
|
||||
\-\-serverlist
|
||||
List the names of all Vim servers that can be found.
|
||||
.TP
|
||||
--servername {name}
|
||||
\-\-servername {name}
|
||||
Use {name} as the server name. Used for the current Vim, unless used with a
|
||||
--remote argument, then it's the name of the server to connect to.
|
||||
\-\-remote argument, then it's the name of the server to connect to.
|
||||
.TP
|
||||
--socketid {id}
|
||||
\-\-socketid {id}
|
||||
GTK GUI only: Use the GtkPlug mechanism to run gvim in another window.
|
||||
.TP
|
||||
--version
|
||||
\-\-version
|
||||
Print version information and exit.
|
||||
.SH ON-LINE HELP
|
||||
Type ":help" in
|
||||
@ -465,7 +465,7 @@ Type ":help" in
|
||||
to get started.
|
||||
Type ":help subject" to get help on a specific subject.
|
||||
For example: ":help ZZ" to get help for the "ZZ" command.
|
||||
Use <Tab> and CTRL-D to complete subjects (":help cmdline-completion").
|
||||
Use <Tab> and CTRL-D to complete subjects (":help cmdline\-completion").
|
||||
Tags are present to jump from one place to another (sort of hypertext links,
|
||||
see ":help").
|
||||
All documentation files can be viewed in this way, for example
|
||||
@ -476,7 +476,7 @@ All documentation files can be viewed in this way, for example
|
||||
The
|
||||
.B Vim
|
||||
documentation files.
|
||||
Use ":help doc-file-list" to get the complete list.
|
||||
Use ":help doc\-file\-list" to get the complete list.
|
||||
.TP
|
||||
/usr/local/lib/vim/doc/tags
|
||||
The tags file used for finding information in the documentation files.
|
||||
|
||||
@ -34,8 +34,8 @@ L'opzione 'foldmethod'
|
||||
linee uguali fra i diversi file in una piegatura. 'foldcolumn' <20> impostato
|
||||
a due per poter facilmente visualizzare le piegature, aprirle e chiuderle.
|
||||
.SH OPZIONI
|
||||
Lo schermo <20> diviso verticalmente, come se aveste usato l'opzione "-O".
|
||||
Per dividerlo orizzontalmente, usare l'opzione "-o".
|
||||
Lo schermo <20> diviso verticalmente, come se aveste usato l'opzione "\-O".
|
||||
Per dividerlo orizzontalmente, usare l'opzione "\-o".
|
||||
.PP
|
||||
Per tutte le altre opzioni, vedere vim(1).
|
||||
.SH VEDERE ANCHE
|
||||
|
||||
@ -21,9 +21,9 @@
|
||||
creates a hex dump of a given file or standard input.
|
||||
It can also convert a hex dump back to its original binary form.
|
||||
Like
|
||||
.BR uuencode(1)
|
||||
.BR uuencode (1)
|
||||
and
|
||||
.BR uudecode(1)
|
||||
.BR uudecode (1)
|
||||
it allows the transmission of binary data in a `mail-safe' ASCII representation,
|
||||
but has the advantage of decoding to standard output.
|
||||
Moreover, it can be used to perform binary file patching.
|
||||
@ -114,19 +114,19 @@ anywhere.
|
||||
.TP
|
||||
.I \-seek offset
|
||||
When used after
|
||||
.I \-r
|
||||
: revert with
|
||||
.IR \-r :
|
||||
revert with
|
||||
.RI < offset >
|
||||
added to file positions found in hexdump.
|
||||
.TP
|
||||
.I \-s [\+][\-]seek
|
||||
.I \-s [+][\-]seek
|
||||
start at
|
||||
.RI < seek >
|
||||
bytes abs. (or rel.) infile offset.
|
||||
\fI\+ \fRindicates that the seek is relative to the current stdin file position
|
||||
\fI+ fRindicates that the seek is relative to the current stdin file position
|
||||
(meaningless when not reading from stdin). \fI\- \fRindicates that the seek
|
||||
should be that many characters from the end of the input (or if combined with
|
||||
\fI \+ \fR: before the current stdin file position).
|
||||
\fI+\fR: before the current stdin file position).
|
||||
Without \-s option, xxd starts at the current file position.
|
||||
.TP
|
||||
.I \-u
|
||||
@ -159,12 +159,12 @@ Note the difference between
|
||||
.br
|
||||
and
|
||||
.br
|
||||
\fI% xxd \-i \< file\fR
|
||||
\fI% xxd \-i < file\fR
|
||||
.PP
|
||||
.I xxd \-s \+seek
|
||||
may be different from
|
||||
.I xxd \-s seek
|
||||
, as lseek(2) is used to "rewind" input. A '+'
|
||||
.IR "xxd \-s seek" ,
|
||||
as lseek(2) is used to "rewind" input. A '+'
|
||||
makes a difference if the input source is stdin, and if stdin's file position
|
||||
is not at the start of the file by the time xxd is started and given its input.
|
||||
The following examples may help to clarify (or further confuse!)...
|
||||
@ -180,7 +180,7 @@ the 1k where dd left off.
|
||||
.br
|
||||
\fI% sh \-c 'dd of=plain_snippet bs=1k count=1; xxd \-s +128 > hex_snippet' < file
|
||||
.PP
|
||||
Hexdump from file position 0x100 ( = 1024-768) on.
|
||||
Hexdump from file position 0x100 ( = 1024\-768) on.
|
||||
.br
|
||||
\fI% sh \-c 'dd of=plain_snippet bs=1k count=1; xxd \-s +-768 > hex_snippet' < file
|
||||
.PP
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
" Vim support file to detect file types
|
||||
"
|
||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||
" Last Change: 2005 Mar 06
|
||||
" Last Change: 2005 Mar 17
|
||||
|
||||
" Listen very carefully, I will say this only once
|
||||
if exists("did_load_filetypes")
|
||||
@ -37,10 +37,18 @@ if !exists("g:ft_ignore_pat")
|
||||
let g:ft_ignore_pat = '\.\(Z\|gz\|bz2\|zip\|tgz\)$'
|
||||
endif
|
||||
|
||||
" Abaqus or Trasys
|
||||
au BufNewFile,BufRead *.inp call FTCheck_inp()
|
||||
" Function used for patterns that end in a star: don't set the filetype if the
|
||||
" file name matches ft_ignore_pat.
|
||||
fun! s:StarSetf(ft)
|
||||
if expand("<amatch>") !~ g:ft_ignore_pat
|
||||
exe 'setf ' . a:ft
|
||||
endif
|
||||
endfun
|
||||
|
||||
fun! FTCheck_inp()
|
||||
" Abaqus or Trasys
|
||||
au BufNewFile,BufRead *.inp call s:Check_inp()
|
||||
|
||||
fun! s:Check_inp()
|
||||
if getline(1) =~ '^\*'
|
||||
setf abaqus
|
||||
else
|
||||
@ -88,10 +96,11 @@ au BufNewFile,BufRead *.run setf ampl
|
||||
au BufNewFile,BufRead build.xml setf ant
|
||||
|
||||
" Apache style config file
|
||||
au BufNewFile,BufRead proftpd.conf* setf apachestyle
|
||||
au BufNewFile,BufRead proftpd.conf* call s:StarSetf('apachestyle')
|
||||
|
||||
" Apache config file
|
||||
au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,.htaccess,apache.conf*,apache2.conf*,/etc/apache2/*.conf* setf apache
|
||||
au BufNewFile,BufRead .htaccess setf apache
|
||||
au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* call s:StarSetf('apache')
|
||||
|
||||
" XA65 MOS6510 cross assembler
|
||||
au BufNewFile,BufRead *.a65 setf a65
|
||||
@ -138,18 +147,18 @@ au BufNewFile,BufRead /boot/grub/menu.lst,/boot/grub/grub.conf setf grub
|
||||
|
||||
" Assembly (all kinds)
|
||||
" *.lst is not pure assembly, it has two extra columns (address, byte codes)
|
||||
au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst call <SID>FTasm()
|
||||
au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst call s:FTasm()
|
||||
|
||||
" This function checks for the kind of assembly that is wanted by the user, or
|
||||
" can be detected from the first five lines of the file.
|
||||
fun! <SID>FTasm()
|
||||
fun! s:FTasm()
|
||||
" make sure b:asmsyntax exists
|
||||
if !exists("b:asmsyntax")
|
||||
let b:asmsyntax = ""
|
||||
endif
|
||||
|
||||
if b:asmsyntax == ""
|
||||
call FTCheck_asmsyntax()
|
||||
call s:FTasmsyntax()
|
||||
endif
|
||||
|
||||
" if b:asmsyntax still isn't set, default to asmsyntax or GNU
|
||||
@ -164,7 +173,7 @@ fun! <SID>FTasm()
|
||||
exe "setf " . b:asmsyntax
|
||||
endfun
|
||||
|
||||
fun! FTCheck_asmsyntax()
|
||||
fun! s:FTasmsyntax()
|
||||
" see if file contains any asmsyntax=foo overrides. If so, change
|
||||
" b:asmsyntax appropriately
|
||||
let head = " ".getline(1)." ".getline(2)." ".getline(3)." ".getline(4).
|
||||
@ -195,11 +204,11 @@ au BufNewFile,BufRead *.awk setf awk
|
||||
au BufNewFile,BufRead *.mch,*.ref,*.imp setf b
|
||||
|
||||
" BASIC or Visual Basic
|
||||
au BufNewFile,BufRead *.bas call <SID>FTVB("basic")
|
||||
au BufNewFile,BufRead *.bas call s:FTVB("basic")
|
||||
|
||||
" Check if one of the first five lines contains "VB_Name". In that case it is
|
||||
" probably a Visual Basic file. Otherwise it's assumed to be "alt" filetype.
|
||||
fun! <SID>FTVB(alt)
|
||||
fun! s:FTVB(alt)
|
||||
if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'VB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
|
||||
setf vb
|
||||
else
|
||||
@ -217,8 +226,8 @@ au BufNewFile,BufRead *.cmd
|
||||
\ if getline(1) =~ '^/\*' | setf rexx | else | setf dosbatch | endif
|
||||
|
||||
" Batch file for 4DOS
|
||||
au BufNewFile,BufRead *.btm call <SID>FTbtm()
|
||||
fun! <SID>FTbtm()
|
||||
au BufNewFile,BufRead *.btm call s:FTbtm()
|
||||
fun! s:FTbtm()
|
||||
if exists("g:dosbatch_syntax_for_btm") && g:dosbatch_syntax_for_btm
|
||||
setf dosbatch
|
||||
else
|
||||
@ -245,9 +254,9 @@ au BufNewFile,BufRead named.root setf bindzone
|
||||
au BufNewFile,BufRead *.bl setf blank
|
||||
|
||||
" C or lpc
|
||||
au BufNewFile,BufRead *.c call <SID>FTlpc()
|
||||
au BufNewFile,BufRead *.c call s:FTlpc()
|
||||
|
||||
fun! <SID>FTlpc()
|
||||
fun! s:FTlpc()
|
||||
if exists("g:lpc_syntax_for_c")
|
||||
let lnum = 1
|
||||
while lnum <= 12
|
||||
@ -262,9 +271,10 @@ fun! <SID>FTlpc()
|
||||
endfun
|
||||
|
||||
" Calendar
|
||||
au BufNewFile,BufRead calendar,*/.calendar/*,
|
||||
au BufNewFile,BufRead calendar setf calendar
|
||||
au BufNewFile,BufRead */.calendar/*,
|
||||
\*/share/calendar/*/calendar.*,*/share/calendar/calendar.*
|
||||
\ setf calendar
|
||||
\ call s:StarSetf('calendar')
|
||||
|
||||
" C#
|
||||
au BufNewFile,BufRead *.cs setf cs
|
||||
@ -320,14 +330,14 @@ au BufNewFile,BufRead [cC]hange[lL]og if getline(1) =~ '; urgency='
|
||||
au BufNewFile,BufRead *..ch setf chill
|
||||
|
||||
" Changes for WEB and CWEB or CHILL
|
||||
au BufNewFile,BufRead *.ch call <SID>FTchange()
|
||||
au BufNewFile,BufRead *.ch call s:FTchange()
|
||||
|
||||
" This function checks if one of the first ten lines start with a '@'. In
|
||||
" that case it is probably a change file.
|
||||
" If the first line starts with # or ! it's probably a ch file.
|
||||
" If a line has "main", "include", "//" ir "/*" it's probably ch.
|
||||
" Otherwise CHILL is assumed.
|
||||
fun! <SID>FTchange()
|
||||
fun! s:FTchange()
|
||||
let lnum = 1
|
||||
while lnum <= 10
|
||||
if getline(lnum)[0] == '@'
|
||||
@ -358,9 +368,9 @@ au BufNewFile,BufRead *.dcl,*.icl setf clean
|
||||
au BufNewFile,BufRead *.eni setf cl
|
||||
|
||||
" Clever or dtd
|
||||
au BufNewFile,BufRead *.ent call <SID>FTent()
|
||||
au BufNewFile,BufRead *.ent call s:FTent()
|
||||
|
||||
fun! <SID>FTent()
|
||||
fun! s:FTent()
|
||||
" This function checks for valid cl syntax in the first five lines.
|
||||
" Look for either an opening comment, '#', or a block start, '{".
|
||||
" If not found, assume SGML.
|
||||
@ -489,12 +499,12 @@ au BufNewFile,BufRead *.ed\(f\|if\|n\|o\) setf edif
|
||||
au BufNewFile,BufRead *.ecd setf ecd
|
||||
|
||||
" Eiffel or Specman
|
||||
au BufNewFile,BufRead *.e,*.E call FTCheck_e()
|
||||
au BufNewFile,BufRead *.e,*.E call s:FTe()
|
||||
|
||||
" Elinks configuration
|
||||
au BufNewFile,BufRead */etc/elinks.conf,*/.elinks/elinks.conf setf elinks
|
||||
|
||||
fun! FTCheck_e()
|
||||
fun! s:FTe()
|
||||
let n = 1
|
||||
while n < 100 && n < line("$")
|
||||
if getline(n) =~ "^\\s*\\(<'\\|'>\\)\\s*$"
|
||||
@ -599,10 +609,10 @@ au BufNewFile,BufRead *.hex,*.h32 setf hex
|
||||
au BufNewFile,BufRead *.t.html setf tilde
|
||||
|
||||
" HTML (.shtml and .stm for server side, .rhtml for Ruby html)
|
||||
au BufNewFile,BufRead *.html,*.htm,*.shtml,*.rhtml,*.stm call <SID>FTCheck_html()
|
||||
au BufNewFile,BufRead *.html,*.htm,*.shtml,*.rhtml,*.stm call s:FThtml()
|
||||
|
||||
" Distinguish between HTML and XHTML
|
||||
fun! <SID>FTCheck_html()
|
||||
fun! s:FThtml()
|
||||
let n = 1
|
||||
while n < 10 && n < line("$")
|
||||
if getline(n) =~ '\<DTD\s\+XHTML\s'
|
||||
@ -628,10 +638,10 @@ au BufNewFile,BufRead *.hb setf hb
|
||||
au BufNewFile,BufRead *.icn setf icon
|
||||
|
||||
" IDL (Interface Description Language)
|
||||
au BufNewFile,BufRead *.idl call <SID>FTCheck_idl()
|
||||
au BufNewFile,BufRead *.idl call s:FTidl()
|
||||
|
||||
" Distinguish between standard IDL and MS-IDL
|
||||
fun! <SID>FTCheck_idl()
|
||||
fun! s:FTidl()
|
||||
let n = 1
|
||||
while n < 50 && n < line("$")
|
||||
if getline(n) =~ '^\s*import\s\+"\(unknwn\|objidl\)\.idl"'
|
||||
@ -693,7 +703,8 @@ au BufNewFile,BufRead *.js,*.javascript setf javascript
|
||||
au BufNewFile,BufRead *.jsp setf jsp
|
||||
|
||||
" Java Properties resource file (note: doesn't catch font.properties.pl)
|
||||
au BufNewFile,BufRead *.properties,*.properties_??,*.properties_??_??,*.properties_??_??_* setf jproperties
|
||||
au BufNewFile,BufRead *.properties,*.properties_??,*.properties_??_?? setf jproperties
|
||||
au BufNewFile,BufRead *.properties_??_??_* call s:StarSetf('jproperties')
|
||||
|
||||
" Jess
|
||||
au BufNewFile,BufRead *.clp setf jess
|
||||
@ -735,7 +746,7 @@ au BufNewFile,BufRead lftp.conf,.lftprc,*lftp/rc setf lftp
|
||||
au BufNewFile,BufRead *.ll setf lifelines
|
||||
|
||||
" Lilo: Linux loader
|
||||
au BufNewFile,BufRead lilo.conf* setf lilo
|
||||
au BufNewFile,BufRead lilo.conf* call s:StarSetf('lilo')
|
||||
|
||||
" Lisp (*.el = ELisp, *.cl = Common Lisp, *.jl = librep Lisp)
|
||||
if has("fname_case")
|
||||
@ -791,9 +802,9 @@ au BufNewFile,BufRead *.mv,*.mpl,*.mws setf maple
|
||||
au BufNewFile,BufRead *.mason,*.mhtml setf mason
|
||||
|
||||
" Matlab or Objective C
|
||||
au BufNewFile,BufRead *.m call FTCheck_m()
|
||||
au BufNewFile,BufRead *.m call s:FTm()
|
||||
|
||||
fun! FTCheck_m()
|
||||
fun! s:FTm()
|
||||
let n = 1
|
||||
while n < 10
|
||||
let line = getline(n)
|
||||
@ -824,9 +835,9 @@ au BufNewFile,BufRead *.mf setf mf
|
||||
au BufNewFile,BufRead *.mp setf mp
|
||||
|
||||
" MMIX or VMS makefile
|
||||
au BufNewFile,BufRead *.mms call FTCheck_mms()
|
||||
au BufNewFile,BufRead *.mms call s:FTmms()
|
||||
|
||||
fun! FTCheck_mms()
|
||||
fun! s:FTmms()
|
||||
let n = 1
|
||||
while n < 10
|
||||
let line = getline(n)
|
||||
@ -867,7 +878,9 @@ au BufNewFile,BufRead *.moo setf moo
|
||||
" Modconf
|
||||
au BufNewFile,BufRead /etc/modules.conf,/etc/conf.modules setf modconf
|
||||
au BufNewFile,BufRead /etc/modutils/*
|
||||
\ if executable(expand("<afile>")) != 1 | setf modconf | endif
|
||||
\ if executable(expand("<afile>")) != 1
|
||||
\| call s:StarSetf('modconf')
|
||||
\|endif
|
||||
|
||||
" Mplayer config
|
||||
au BufNewFile,BufRead mplayer.conf,*/.mplayer/config setf mplayerconf
|
||||
@ -891,7 +904,8 @@ au BufRead,BufNewFile *.mu setf mupad
|
||||
au BufNewFile,BufRead *.mush setf mush
|
||||
|
||||
" Mutt setup file
|
||||
au BufNewFile,BufRead .muttrc*,*/.mutt/muttrc*,Muttrc setf muttrc
|
||||
au BufNewFile,BufRead Muttrc setf muttrc
|
||||
au BufNewFile,BufRead .muttrc*,*/.mutt/muttrc* call s:StarSetf('muttrc')
|
||||
|
||||
" Nastran input/DMAP
|
||||
"au BufNewFile,BufRead *.dat setf nastran
|
||||
@ -911,11 +925,11 @@ au BufNewFile,BufRead *.me
|
||||
\ setf nroff |
|
||||
\ endif
|
||||
au BufNewFile,BufRead *.tr,*.nr,*.roff,*.tmac,*.mom setf nroff
|
||||
au BufNewFile,BufRead *.[1-9] call <SID>FTnroff()
|
||||
au BufNewFile,BufRead *.[1-9] call s:FTnroff()
|
||||
|
||||
" This function checks if one of the first five lines start with a dot. In
|
||||
" that case it is probably an nroff file: 'filetype' is set and 1 is returned.
|
||||
fun! <SID>FTnroff()
|
||||
fun! s:FTnroff()
|
||||
if getline(1)[0] . getline(2)[0] . getline(3)[0] . getline(4)[0] . getline(5)[0] =~ '\.'
|
||||
setf nroff
|
||||
return 1
|
||||
@ -924,9 +938,9 @@ fun! <SID>FTnroff()
|
||||
endfun
|
||||
|
||||
" Nroff or Objective C++
|
||||
au BufNewFile,BufRead *.mm call <SID>FTcheck_mm()
|
||||
au BufNewFile,BufRead *.mm call s:FTmm()
|
||||
|
||||
fun! <SID>FTcheck_mm()
|
||||
fun! s:FTmm()
|
||||
let n = 1
|
||||
while n < 10
|
||||
let line = getline(n)
|
||||
@ -977,13 +991,13 @@ au BufNewFile,BufRead *.dpr setf pascal
|
||||
|
||||
" Perl
|
||||
if has("fname_case")
|
||||
au BufNewFile,BufRead *.pl,*.PL call FTCheck_pl()
|
||||
au BufNewFile,BufRead *.pl,*.PL call s:FTpl()
|
||||
else
|
||||
au BufNewFile,BufRead *.pl call FTCheck_pl()
|
||||
au BufNewFile,BufRead *.pl call s:FTpl()
|
||||
endif
|
||||
au BufNewFile,BufRead *.plx setf perl
|
||||
|
||||
fun! FTCheck_pl()
|
||||
fun! s:FTpl()
|
||||
if exists("g:filetype_pl")
|
||||
exe "setf " . g:filetype_pl
|
||||
else
|
||||
@ -1057,9 +1071,9 @@ au BufNewFile,BufRead *.pov setf pov
|
||||
au BufNewFile,BufRead .povrayrc setf povini
|
||||
|
||||
" Povray, PHP or assembly
|
||||
au BufNewFile,BufRead *.inc call FTCheck_inc()
|
||||
au BufNewFile,BufRead *.inc call s:FTinc()
|
||||
|
||||
fun! FTCheck_inc()
|
||||
fun! s:FTinc()
|
||||
if exists("g:filetype_inc")
|
||||
exe "setf " . g:filetype_inc
|
||||
else
|
||||
@ -1071,7 +1085,7 @@ fun! FTCheck_inc()
|
||||
elseif lines =~ "<?"
|
||||
setf php
|
||||
else
|
||||
call FTCheck_asmsyntax()
|
||||
call s:FTasmsyntax()
|
||||
if exists("b:asmsyntax")
|
||||
exe "setf " . b:asmsyntax
|
||||
else
|
||||
@ -1101,9 +1115,9 @@ au BufNewFile,BufRead .pc setf proc
|
||||
au BufNewFile,BufRead .procmail,.procmailrc setf procmail
|
||||
|
||||
" Progress or CWEB
|
||||
au BufNewFile,BufRead *.w call <SID>FTprogress_cweb()
|
||||
au BufNewFile,BufRead *.w call s:FTprogress_cweb()
|
||||
|
||||
function! <SID>FTprogress_cweb()
|
||||
function! s:FTprogress_cweb()
|
||||
if exists("g:filetype_w")
|
||||
exe "setf " . g:filetype_w
|
||||
return
|
||||
@ -1116,9 +1130,9 @@ function! <SID>FTprogress_cweb()
|
||||
endfun
|
||||
|
||||
" Progress or assembly
|
||||
au BufNewFile,BufRead *.i call <SID>FTprogress_asm()
|
||||
au BufNewFile,BufRead *.i call s:FTprogress_asm()
|
||||
|
||||
function! <SID>FTprogress_asm()
|
||||
function! s:FTprogress_asm()
|
||||
if exists("g:filetype_i")
|
||||
exe "setf " . g:filetype_i
|
||||
return
|
||||
@ -1129,7 +1143,7 @@ function! <SID>FTprogress_asm()
|
||||
while lnum <= 10
|
||||
let line = getline(lnum)
|
||||
if line =~ '^\s*;' || line =~ '^\*'
|
||||
call FTCheck_asm()
|
||||
call s:FTasm()
|
||||
return
|
||||
elseif line !~ '^\s*$' || line =~ '^/\*'
|
||||
" Not an empty line: Doesn't look like valid assembly code.
|
||||
@ -1142,9 +1156,9 @@ function! <SID>FTprogress_asm()
|
||||
endfun
|
||||
|
||||
" Progress or Pascal
|
||||
au BufNewFile,BufRead *.p call <SID>FTprogress_pascal()
|
||||
au BufNewFile,BufRead *.p call s:FTprogress_pascal()
|
||||
|
||||
function! <SID>FTprogress_pascal()
|
||||
function! s:FTprogress_pascal()
|
||||
if exists("g:filetype_p")
|
||||
exe "setf " . g:filetype_p
|
||||
return
|
||||
@ -1212,9 +1226,9 @@ au BufNewFile,BufRead *.rexx,*.rex setf rexx
|
||||
au BufNewFile,BufRead *.s,*.S setf r
|
||||
|
||||
" Rexx, Rebol or R
|
||||
au BufNewFile,BufRead *.r,*.R call <SID>FTCheck_r()
|
||||
au BufNewFile,BufRead *.r,*.R call s:FTr()
|
||||
|
||||
fun! <SID>FTCheck_r()
|
||||
fun! s:FTr()
|
||||
if getline(1) =~ '^REBOL'
|
||||
setf rebol
|
||||
else
|
||||
@ -1243,7 +1257,7 @@ fun! <SID>FTCheck_r()
|
||||
endfun
|
||||
|
||||
" Remind
|
||||
au BufNewFile,BufRead .reminders* setf remind
|
||||
au BufNewFile,BufRead .reminders* call s:StarSetf('remind')
|
||||
|
||||
" Resolv.conf
|
||||
au BufNewFile,BufRead resolv.conf setf resolv
|
||||
@ -1317,7 +1331,8 @@ au BufNewFile,BufRead *.decl,*.dcl,*.dec
|
||||
\ endif
|
||||
|
||||
" SGML catalog file
|
||||
au BufNewFile,BufRead sgml.catalog*,catalog setf catalog
|
||||
au BufNewFile,BufRead catalog setf catalog
|
||||
au BufNewFile,BufRead sgml.catalog* call s:StarSetf('catalog')
|
||||
|
||||
" Shell scripts (sh, ksh, bash, bash2, csh); Allow .profile_foo etc.
|
||||
" Gentoo ebuilds are actually bash scripts
|
||||
@ -1325,7 +1340,11 @@ au BufNewFile,BufRead .bashrc*,bashrc,bash.bashrc,.bash_profile*,.bash_logout*,*
|
||||
au BufNewFile,BufRead .kshrc*,*.ksh call SetFileTypeSH("ksh")
|
||||
au BufNewFile,BufRead /etc/profile,.profile*,*.sh,*.env call SetFileTypeSH(getline(1))
|
||||
|
||||
" Also called from scripts.vim.
|
||||
fun! SetFileTypeSH(name)
|
||||
if expand("<amatch>") =~ g:ft_ignore_pat
|
||||
return
|
||||
endif
|
||||
if a:name =~ '\<ksh\>'
|
||||
let b:is_kornshell = 1
|
||||
if exists("b:is_bash")
|
||||
@ -1356,7 +1375,11 @@ endfun
|
||||
|
||||
" For shell-like file types, check for an "exec" command hidden in a comment,
|
||||
" as used for Tcl.
|
||||
" Also called from scripts.vim, thus can't be local to this script.
|
||||
fun! SetFileTypeShell(name)
|
||||
if expand("<amatch>") =~ g:ft_ignore_pat
|
||||
return
|
||||
endif
|
||||
let l = 2
|
||||
while l < 20 && l < line("$") && getline(l) =~ '^\s*\(#\|$\)'
|
||||
" Skip empty and comment lines.
|
||||
@ -1377,9 +1400,9 @@ endfun
|
||||
au BufNewFile,BufRead .tcshrc*,*.tcsh,tcsh.tcshrc,tcsh.login call SetFileTypeShell("tcsh")
|
||||
|
||||
" csh scripts, but might also be tcsh scripts (on some systems csh is tcsh)
|
||||
au BufNewFile,BufRead .login*,.cshrc*,csh.cshrc,csh.login,csh.logout,*.csh,.alias call SetFileTypeCSH()
|
||||
au BufNewFile,BufRead .login*,.cshrc*,csh.cshrc,csh.login,csh.logout,*.csh,.alias call s:CSH()
|
||||
|
||||
fun! SetFileTypeCSH()
|
||||
fun! s:CSH()
|
||||
if exists("g:filetype_csh")
|
||||
call SetFileTypeShell(g:filetype_csh)
|
||||
elseif &shell =~ "tcsh"
|
||||
@ -1390,7 +1413,8 @@ fun! SetFileTypeCSH()
|
||||
endfun
|
||||
|
||||
" Z-Shell script
|
||||
au BufNewFile,BufRead .zsh*,.zlog*,.zprofile,/etc/zprofile,.zfbfmarks,.zcompdump* setf zsh
|
||||
au BufNewFile,BufRead .zprofile,/etc/zprofile,.zfbfmarks setf zsh
|
||||
au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump* call s:StarSetf('zsh')
|
||||
|
||||
" Scheme
|
||||
au BufNewFile,BufRead *.scm,*.ss setf scheme
|
||||
@ -1467,9 +1491,9 @@ au BufNewFile,BufRead squid.conf setf squid
|
||||
au BufNewFile,BufRead *.tyb,*.typ,*.tyc,*.pkb,*.pks setf sql
|
||||
|
||||
" SQL
|
||||
au BufNewFile,BufRead *.sql call SetFileTypeSQL()
|
||||
au BufNewFile,BufRead *.sql call s:SQL()
|
||||
|
||||
fun! SetFileTypeSQL()
|
||||
fun! s:SQL()
|
||||
if exists("g:filetype_sql")
|
||||
exe "setf " . g:filetype_sql
|
||||
else
|
||||
@ -1500,7 +1524,7 @@ au BufNewFile,BufRead /etc/sudoers,sudoers.tmp setf sudoers
|
||||
|
||||
" Tads (or Nroff)
|
||||
au BufNewFile,BufRead *.t
|
||||
\ if !<SID>FTnroff() | setf tads | endif
|
||||
\ if !s:FTnroff() | setf tads | endif
|
||||
|
||||
" Tags
|
||||
au BufNewFile,BufRead tags setf tags
|
||||
@ -1557,7 +1581,8 @@ au BufNewFile,BufRead *.uc setf uc
|
||||
au BufNewFile,BufRead *.v setf verilog
|
||||
|
||||
" VHDL
|
||||
au BufNewFile,BufRead *.hdl,*.vhd,*.vhdl,*.vhdl_[0-9]*,*.vbe,*.vst setf vhdl
|
||||
au BufNewFile,BufRead *.hdl,*.vhd,*.vhdl,*.vbe,*.vst setf vhdl
|
||||
au BufNewFile,BufRead *.vhdl_[0-9]* call s:StarSetf('vhdl')
|
||||
|
||||
" Vim script
|
||||
au BufNewFile,BufRead *.vim,.exrc,_exrc setf vim
|
||||
@ -1569,7 +1594,7 @@ au BufNewFile,BufRead .viminfo,_viminfo setf viminfo
|
||||
au BufRead,BufNewFile *.hw,*.module,*.pkg setf virata
|
||||
|
||||
" Visual Basic (also uses *.bas) or FORM
|
||||
au BufNewFile,BufRead *.frm call <SID>FTVB("form")
|
||||
au BufNewFile,BufRead *.frm call s:FTVB("form")
|
||||
|
||||
" SaxBasic is close to Visual Basic
|
||||
au BufNewFile,BufRead *.sba setf vb
|
||||
@ -1641,7 +1666,7 @@ au BufNewFile,BufRead .Xdefaults,.Xpdefaults,.Xresources,xdm-config,*.ad setf xd
|
||||
" Xmath
|
||||
au BufNewFile,BufRead *.msc,*.msf setf xmath
|
||||
au BufNewFile,BufRead *.ms
|
||||
\ if !<SID>FTnroff() | setf xmath | endif
|
||||
\ if !s:FTnroff() | setf xmath | endif
|
||||
|
||||
" XML
|
||||
au BufNewFile,BufRead *.xml
|
||||
@ -1681,7 +1706,7 @@ augroup END
|
||||
|
||||
" Source the user-specified filetype file, for backwards compatibility with
|
||||
" Vim 5.x.
|
||||
if exists("myfiletypefile") && file_readable(expand(myfiletypefile))
|
||||
if exists("myfiletypefile") && filereadable(expand(myfiletypefile))
|
||||
execute "source " . myfiletypefile
|
||||
endif
|
||||
|
||||
@ -1699,80 +1724,93 @@ au StdinReadPost * if !did_filetype() | runtime! scripts.vim | endif
|
||||
" Extra checks for when no filetype has been detected now. Mostly used for
|
||||
" patterns that end in "*". E.g., "zsh*" matches "zsh.vim", but that's a Vim
|
||||
" script file.
|
||||
" Most of these should call s:StarSetf() to avoid names ending in .gz and the
|
||||
" like are used.
|
||||
|
||||
" BIND zone
|
||||
au BufNewFile,BufRead /var/named/* setf bindzone
|
||||
au BufNewFile,BufRead /var/named/* call s:StarSetf('bindzone')
|
||||
|
||||
" Changelog
|
||||
au BufNewFile,BufRead [cC]hange[lL]og* if getline(1) =~ '; urgency='
|
||||
\| setf debchangelog | else | setf changelog | endif
|
||||
au BufNewFile,BufRead [cC]hange[lL]og*
|
||||
\ if getline(1) =~ '; urgency='
|
||||
\| call s:StarSetf('debchangelog')
|
||||
\|else
|
||||
\| call s:StarSetf('changelog')
|
||||
\|endif
|
||||
|
||||
" Crontab
|
||||
au BufNewFile,BufRead crontab,crontab.* setf crontab
|
||||
au BufNewFile,BufRead crontab,crontab.* call s:StarSetf('crontab')
|
||||
|
||||
" Dracula
|
||||
au BufNewFile,BufRead drac.* setf dracula
|
||||
au BufNewFile,BufRead drac.* call s:StarSetf('dracula')
|
||||
|
||||
" Fvwm
|
||||
au BufNewFile,BufRead *fvwmrc*,*fvwm95*.hook
|
||||
\ let b:fvwm_version = 1 | setf fvwm
|
||||
\ let b:fvwm_version = 1 | call s:StarSetf('fvwm')
|
||||
au BufNewFile,BufRead *fvwm2rc*
|
||||
\ if expand("<afile>:e") == "m4" | setf fvwm2m4 | else |
|
||||
\ let b:fvwm_version = 2 | setf fvwm | endif
|
||||
\ if expand("<afile>:e") == "m4"
|
||||
\| call s:StarSetf('fvwm2m4')
|
||||
\|else
|
||||
\| let b:fvwm_version = 2 | call s:StarSetf('fvwm')
|
||||
\|endif
|
||||
|
||||
" GTK RC
|
||||
au BufNewFile,BufRead .gtkrc*,gtkrc* setf gtkrc
|
||||
au BufNewFile,BufRead .gtkrc*,gtkrc* call s:StarSetf('gtkrc')
|
||||
|
||||
" Jam
|
||||
au BufNewFile,BufRead Prl*.*,JAM*.* setf jam
|
||||
au BufNewFile,BufRead Prl*.*,JAM*.* call s:StarSetf('jam')
|
||||
|
||||
" Jargon
|
||||
au! BufNewFile,BufRead *jarg*
|
||||
\ if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'THIS IS THE JARGON FILE' |
|
||||
\ setf jargon |
|
||||
\ endif
|
||||
\ if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'THIS IS THE JARGON FILE'
|
||||
\| call s:StarSetf('jargon')
|
||||
\|endif
|
||||
|
||||
" Makefile
|
||||
au BufNewFile,BufRead [mM]akefile* setf make
|
||||
au BufNewFile,BufRead [mM]akefile* call s:StarSetf('make')
|
||||
|
||||
" Ruby Makefile
|
||||
au BufNewFile,BufRead [rR]akefile* setf ruby
|
||||
au BufNewFile,BufRead [rR]akefile* call s:StarSetf('ruby')
|
||||
|
||||
" Mutt setup file
|
||||
au BufNewFile,BufRead muttrc*,Muttrc* setf muttrc
|
||||
au BufNewFile,BufRead muttrc*,Muttrc* call s:StarSetf('muttrc')
|
||||
|
||||
" Nroff macros
|
||||
au BufNewFile,BufRead tmac.* setf nroff
|
||||
au BufNewFile,BufRead tmac.* call s:StarSetf('nroff')
|
||||
|
||||
" Printcap and Termcap
|
||||
au BufNewFile,BufRead *printcap*
|
||||
\ if !did_filetype() | let b:ptcap_type = "print" | setf ptcap | endif
|
||||
\ if !did_filetype()
|
||||
\| let b:ptcap_type = "print" | call s:StarSetf('ptcap')
|
||||
\|endif
|
||||
au BufNewFile,BufRead *termcap*
|
||||
\ if !did_filetype() | let b:ptcap_type = "term" | setf ptcap | endif
|
||||
\ if !did_filetype()
|
||||
\| let b:ptcap_type = "term" | call s:StarSetf('ptcap')
|
||||
\|endif
|
||||
|
||||
" Vim script
|
||||
au BufNewFile,BufRead *vimrc* setf vim
|
||||
au BufNewFile,BufRead *vimrc* call s:StarSetf('vim')
|
||||
|
||||
" Subversion commit file
|
||||
au BufNewFile,BufRead svn-commit*.tmp setf svn
|
||||
|
||||
" X resources file
|
||||
au BufNewFile,BufRead Xresources*,*/app-defaults/*,*/Xresources/* setf xdefaults
|
||||
au BufNewFile,BufRead Xresources*,*/app-defaults/*,*/Xresources/* call s:StarSetf('xdefaults')
|
||||
|
||||
" XFree86 config
|
||||
au BufNewFile,BufRead XF86Config-4*
|
||||
\ let b:xf86c_xfree86_version = 4 | setf xf86conf
|
||||
\ let b:xf86c_xfree86_version = 4 | call s:StarSetf('xf86conf')
|
||||
au BufNewFile,BufRead XF86Config*
|
||||
\ if getline(1) =~ '\<XConfigurator\>' |
|
||||
\ let b:xf86c_xfree86_version = 3 |
|
||||
\ endif |
|
||||
\ setf xf86conf
|
||||
\ if getline(1) =~ '\<XConfigurator\>'
|
||||
\| let b:xf86c_xfree86_version = 3
|
||||
\|endif
|
||||
\|call s:StarSetf('xf86conf')
|
||||
|
||||
" X11 xmodmap
|
||||
au BufNewFile,BufRead *xmodmap* setf xmodmap
|
||||
au BufNewFile,BufRead *xmodmap* call s:StarSetf('xmodmap')
|
||||
|
||||
" Z-Shell script
|
||||
au BufNewFile,BufRead zsh*,zlog* setf zsh
|
||||
au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh')
|
||||
|
||||
|
||||
" Generic configuration file (check this last, it's just guessing!)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
" Menu Translations: Italian / Italiano
|
||||
" Maintainer: Antonio Colombo <antonio.colombo@jrc.it>
|
||||
" Maintainer: Antonio Colombo <azc10@yahoo.com>
|
||||
" Vlad Sandrini <sator72@libero.it>
|
||||
" Last Change: 2004 Mar 3
|
||||
" Last Change: 2005 Mar 16
|
||||
|
||||
" Quit when menu translations have already been done.
|
||||
if exists("did_menu_trans")
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
" Vim syntax file
|
||||
" Language: awk, nawk, gawk, mawk
|
||||
" Maintainer: Antonio Colombo <antonio.colombo@jrc.it>
|
||||
" Last Change: 2002 Jun 23
|
||||
" Maintainer: Antonio Colombo <azc10@yahoo.com>
|
||||
" Last Change: 2005 Mar 16
|
||||
|
||||
" AWK ref. is: Alfred V. Aho, Brian W. Kernighan, Peter J. Weinberger
|
||||
" The AWK Programming Language, Addison-Wesley, 1988
|
||||
|
||||
@ -801,5 +801,5 @@ NOTA: Eviti cos
|
||||
Colorado School of Mines, usando idee fornite da Charles Smith,
|
||||
Colorado State University - E-mail: bware@mines.colorado.edu
|
||||
Modificato per Vim da Bram Moolenaar.
|
||||
Segnalare refusi ad Antonio Colombo - E-mail: antonio.colombo@jrc.it
|
||||
Segnalare refusi ad Antonio Colombo - E-mail: azc10@yahoo.com
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
33
src/Makefile
33
src/Makefile
@ -1278,9 +1278,15 @@ DEST_TUTOR = $(DESTDIR)$(TUTORSUBLOC)
|
||||
DEST_SCRIPT = $(DESTDIR)$(SCRIPTLOC)
|
||||
DEST_PRINT = $(DESTDIR)$(PRINTSUBLOC)
|
||||
DEST_MAN_TOP = $(DESTDIR)$(MANDIR)
|
||||
|
||||
# We assume that the ".../man/xx/man1/" directory is for latin1 manual pages.
|
||||
# Some systems use UTF-8, but these should find the ".../man/xx.UTF-8/man1/"
|
||||
# directory first.
|
||||
DEST_MAN = $(DEST_MAN_TOP)$(MAN1DIR)
|
||||
DEST_MAN_IT = $(DEST_MAN_TOP)/it$(MAN1DIR)
|
||||
DEST_MAN_RU = $(DEST_MAN_TOP)/ru$(MAN1DIR)
|
||||
DEST_MAN_IT_U = $(DEST_MAN_TOP)/it.UTF-8$(MAN1DIR)
|
||||
DEST_MAN_RU = $(DEST_MAN_TOP)/ru.KOI8-R$(MAN1DIR)
|
||||
DEST_MAN_RU_U = $(DEST_MAN_TOP)/ru.UTF-8$(MAN1DIR)
|
||||
|
||||
# BASIC_SRC: files that are always used
|
||||
# GUI_SRC: extra GUI files for current configuration
|
||||
@ -1798,7 +1804,9 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \
|
||||
chmod $(BINMOD) $(DEST_BIN)/xxd$(EXEEXT)
|
||||
-$(SHELL) ./installman.sh xxd $(DEST_MAN) "" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
|
||||
# install the runtime tools
|
||||
$(INSTALL_DATA_R) $(TOOLSSOURCE)/* $(DEST_TOOLS)
|
||||
# When using CVS some CVS directories might have been copied.
|
||||
@ -1817,11 +1825,17 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \
|
||||
# install the language specific files, if they were unpacked
|
||||
install-languages: languages $(DEST_LANG) $(DEST_KMAP)
|
||||
-$(SHELL) ./installman.sh install $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh install $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh install $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh install $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_IT) $(INSTALLMLARGS)
|
||||
-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_IT_U) $(INSTALLMLARGS)
|
||||
-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_RU) $(INSTALLMLARGS)
|
||||
-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_RU_U) $(INSTALLMLARGS)
|
||||
if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
|
||||
cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LANG) \
|
||||
INSTALL_DATA=$(INSTALL_DATA) FILEMOD=$(FILEMOD) install; \
|
||||
@ -1967,15 +1981,23 @@ uninstall: uninstall_runtime
|
||||
# Note: the "rmdir" will fail if any files were added after "make install"
|
||||
uninstall_runtime:
|
||||
-$(SHELL) ./installman.sh uninstall $(DEST_MAN) "" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh uninstall $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh uninstall $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh uninstall $(DEST_MAN_IT) "" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh uninstall $(DEST_MAN_IT_U) "" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh uninstall $(DEST_MAN_RU) "" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh uninstall $(DEST_MAN_RU_U) "" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN) $(INSTALLMLARGS)
|
||||
-$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_IT) $(INSTALLMLARGS)
|
||||
-$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_IT_U) $(INSTALLMLARGS)
|
||||
-$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_RU) $(INSTALLMLARGS)
|
||||
-rm -f $(DEST_MAN)/xxd.1 $(DEST_MAN_IT)/xxd.1 $(DEST_MAN_RU)/xxd.1
|
||||
-$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_RU_U) $(INSTALLMLARGS)
|
||||
-rm -f $(DEST_MAN)/xxd.1
|
||||
-rm -f $(DEST_MAN_IT)/xxd.1 $(DEST_MAN_IT_U)/xxd.1
|
||||
-rm -f $(DEST_MAN_RU)/xxd.1 $(DEST_MAN_RU_U)/xxd.1
|
||||
-rm -f $(DEST_HELP)/*.txt $(DEST_HELP)/tags $(DEST_HELP)/*.pl
|
||||
-rm -f $(DEST_HELP)/*.??x $(DEST_HELP)/tags-??
|
||||
-rm -f $(SYS_MENU_FILE) $(SYS_SYNMENU_FILE) $(SYS_DELMENU_FILE)
|
||||
@ -2423,6 +2445,9 @@ install_macosx: gui_bundle
|
||||
gui_bundle: $(APPDIR) bundle-dir bundle-executable bundle-info bundle-resource \
|
||||
bundle-language
|
||||
|
||||
$(APPDIR):
|
||||
mkdir -p $@
|
||||
|
||||
bundle-dir: $(APPDIR)/Contents $(VIMTARGET)
|
||||
-@srcdir=`pwd`; cd $(HELPSOURCE); $(MAKE) VIMEXE=$$srcdir/$(VIMTARGET) vimtags
|
||||
cp -R ../runtime $(APPDIR)
|
||||
|
||||
@ -3701,7 +3701,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
|
||||
while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
|
||||
? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
|
||||
: (O_CREAT | O_TRUNC))
|
||||
, perm & 0777)) < 0)
|
||||
, perm < 0 ? 0666 : (perm & 0777))) < 0)
|
||||
{
|
||||
/*
|
||||
* A forced write will try to create a new file if the old one is
|
||||
@ -4269,7 +4269,7 @@ restore_backup:
|
||||
|
||||
if (org == NULL
|
||||
|| (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL,
|
||||
perm & 0777)) < 0)
|
||||
perm < 0 ? 0666 : (perm & 0777))) < 0)
|
||||
EMSG(_("E206: patchmode: can't touch empty original file"));
|
||||
else
|
||||
close(empty_fd);
|
||||
|
||||
@ -1073,9 +1073,11 @@ EXTERN int no_hlsearch INIT(= FALSE);
|
||||
|
||||
#ifdef FEAT_BEVAL
|
||||
EXTERN BalloonEval *balloonEval INIT(= NULL);
|
||||
# if defined(FEAT_NETBEANS_INTG) || defined(FEAT_SUN_WORKSHOP)
|
||||
EXTERN int bevalServers INIT(= 0);
|
||||
# define BEVAL_NETBEANS 0x01
|
||||
# define BEVAL_WORKSHOP 0x02
|
||||
# define BEVAL_NETBEANS 0x01
|
||||
# define BEVAL_WORKSHOP 0x02
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef CURSOR_SHAPE
|
||||
|
||||
@ -553,11 +553,11 @@ gui_init()
|
||||
balloonEval = gui_mch_create_beval_area(gui.drawarea, NULL,
|
||||
&general_beval_cb, NULL);
|
||||
# else
|
||||
# ifdef FEAT_GUI_MOTIF
|
||||
# if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
|
||||
{
|
||||
extern Widget textArea;
|
||||
balloonEval = gui_mch_create_beval_area(textArea, NULL,
|
||||
&general_beval_cb, NULL);
|
||||
&general_beval_cb, NULL);
|
||||
}
|
||||
# else
|
||||
# ifdef FEAT_GUI_W32
|
||||
|
||||
@ -1372,7 +1372,7 @@ gui_mch_destroy_menu(menu)
|
||||
|
||||
parent = XtParent(menu->id);
|
||||
#if defined(FEAT_TOOLBAR) && defined(FEAT_BEVAL)
|
||||
if ((parent == toolBar) && (menu->tip != NULL))
|
||||
if (parent == toolBar && menu->tip != NULL)
|
||||
{
|
||||
/* We try to destroy this before the actual menu, because there are
|
||||
* callbacks, etc. that will be unregistered during the tooltip
|
||||
|
||||
@ -920,7 +920,7 @@ wait_return(redraw)
|
||||
* CTRL-C, but we need to loop then. */
|
||||
had_got_int = got_int;
|
||||
c = safe_vgetc();
|
||||
if (!global_busy)
|
||||
if (had_got_int && !global_busy)
|
||||
got_int = FALSE;
|
||||
#ifdef FEAT_CLIPBOARD
|
||||
/* Strange way to allow copying (yanking) a modeless selection at
|
||||
|
||||
@ -2098,7 +2098,7 @@ op_colon(oap)
|
||||
stuffReadbuff((char_u *)"fmt");
|
||||
else
|
||||
stuffReadbuff(p_fp);
|
||||
stuffReadbuff((char_u *)"\n");
|
||||
stuffReadbuff((char_u *)"\n']");
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -648,6 +648,13 @@ op_reindent(oap, how)
|
||||
linenr_T last_changed = 0;
|
||||
linenr_T start_lnum = curwin->w_cursor.lnum;
|
||||
|
||||
/* Don't even try when 'modifiable' is off. */
|
||||
if (!curbuf->b_p_ma)
|
||||
{
|
||||
EMSG(_(e_modifiable));
|
||||
return;
|
||||
}
|
||||
|
||||
for (i = oap->line_count; --i >= 0 && !got_int; )
|
||||
{
|
||||
/* it's a slow thing to do, so give feedback so there's no worry that
|
||||
|
||||
@ -330,9 +330,6 @@ mch_inchar(buf, maxlen, wtime, tb_change_cnt)
|
||||
int tb_change_cnt;
|
||||
{
|
||||
int len;
|
||||
#ifdef FEAT_AUTOCMD
|
||||
static int once_already = 0;
|
||||
#endif
|
||||
|
||||
/* Check if window changed size while we were busy, perhaps the ":set
|
||||
* columns=99" command was used. */
|
||||
@ -344,46 +341,33 @@ mch_inchar(buf, maxlen, wtime, tb_change_cnt)
|
||||
while (WaitForChar(wtime) == 0) /* no character available */
|
||||
{
|
||||
if (!do_resize) /* return if not interrupted by resize */
|
||||
{
|
||||
#ifdef FEAT_AUTOCMD
|
||||
once_already = 0;
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
handle_resize();
|
||||
}
|
||||
}
|
||||
else /* wtime == -1 */
|
||||
{
|
||||
#ifdef FEAT_AUTOCMD
|
||||
if (once_already == 2)
|
||||
updatescript(0);
|
||||
else if (once_already == 1)
|
||||
{
|
||||
setcursor();
|
||||
once_already = 2;
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
/*
|
||||
* If there is no character available within 'updatetime' seconds
|
||||
* flush all the swap files to disk
|
||||
* flush all the swap files to disk.
|
||||
* Also done when interrupted by SIGWINCH.
|
||||
*/
|
||||
if (WaitForChar(p_ut) == 0)
|
||||
{
|
||||
#ifdef FEAT_AUTOCMD
|
||||
if (has_cursorhold() && get_real_state() == NORMAL_BUSY)
|
||||
if (!did_cursorhold
|
||||
&& has_cursorhold()
|
||||
&& get_real_state() == NORMAL_BUSY
|
||||
&& maxlen >= 3
|
||||
&& !typebuf_changed(tb_change_cnt))
|
||||
{
|
||||
apply_autocmds(EVENT_CURSORHOLD, NULL, NULL, FALSE, curbuf);
|
||||
update_screen(VALID);
|
||||
once_already = 1;
|
||||
return 0;
|
||||
buf[0] = K_SPECIAL;
|
||||
buf[1] = KS_EXTRA;
|
||||
buf[2] = (int)KE_CURSORHOLD;
|
||||
return 3;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
updatescript(0);
|
||||
updatescript(0);
|
||||
}
|
||||
}
|
||||
|
||||
@ -418,9 +402,6 @@ mch_inchar(buf, maxlen, wtime, tb_change_cnt)
|
||||
for (i = 0; i < len; i++)
|
||||
if (buf[i] == 0)
|
||||
buf[i] = K_NUL;
|
||||
#endif
|
||||
#ifdef FEAT_AUTOCMD
|
||||
once_already = 0;
|
||||
#endif
|
||||
return len;
|
||||
}
|
||||
|
||||
25
src/screen.c
25
src/screen.c
@ -2023,6 +2023,7 @@ fold_line(wp, fold_count, foldinfo, lnum, row)
|
||||
int col;
|
||||
int txtcol;
|
||||
int off = (int)(current_ScreenLine - ScreenLines);
|
||||
int ri;
|
||||
|
||||
/* Build the fold line:
|
||||
* 1. Add the cmdwin_type for the command-line window
|
||||
@ -2078,13 +2079,19 @@ fold_line(wp, fold_count, foldinfo, lnum, row)
|
||||
}
|
||||
|
||||
#ifdef FEAT_RIGHTLEFT
|
||||
# define RL_MEMSET(p, v, l) vim_memset(ScreenAttrs + off + (wp->w_p_rl ? (W_WIDTH(wp) - (p) - (l)) : (p)), v, l)
|
||||
# define RL_MEMSET(p, v, l) if (wp->w_p_rl) \
|
||||
for (ri = 0; ri < l; ++ri) \
|
||||
ScreenAttrs[off + (W_WIDTH(wp) - (p) - (l)) + ri] = v; \
|
||||
else \
|
||||
for (ri = 0; ri < l; ++ri) \
|
||||
ScreenAttrs[off + (p) + ri] = v
|
||||
#else
|
||||
# define RL_MEMSET(p, v, l) vim_memset(ScreenAttrs + off + p, v, l)
|
||||
# define RL_MEMSET(p, v, l) for (ri = 0; ri < l; ++ri) \
|
||||
ScreenAttrs[off + (p) + ri] = v
|
||||
#endif
|
||||
|
||||
/* Set all attributes of the 'number' column and the text */
|
||||
RL_MEMSET(col, hl_attr(HLF_FL), (size_t)(W_WIDTH(wp) - col));
|
||||
RL_MEMSET(col, hl_attr(HLF_FL), W_WIDTH(wp) - col);
|
||||
|
||||
#ifdef FEAT_SIGNS
|
||||
/* If signs are being displayed, add two spaces. */
|
||||
@ -2330,13 +2337,14 @@ fold_line(wp, fold_count, foldinfo, lnum, row)
|
||||
else
|
||||
len = W_WIDTH(wp) - txtcol;
|
||||
RL_MEMSET(wp->w_old_cursor_fcol + txtcol, hl_attr(HLF_V),
|
||||
(size_t)(len - wp->w_old_cursor_fcol));
|
||||
len - wp->w_old_cursor_fcol);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Set all attributes of the text */
|
||||
RL_MEMSET(txtcol, hl_attr(HLF_V),
|
||||
(size_t)(W_WIDTH(wp) - txtcol));
|
||||
RL_MEMSET(txtcol, hl_attr(HLF_V), W_WIDTH(wp) - txtcol);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@ -2370,12 +2378,15 @@ copy_text_attr(off, buf, len, attr)
|
||||
int len;
|
||||
int attr;
|
||||
{
|
||||
int i;
|
||||
|
||||
mch_memmove(ScreenLines + off, buf, (size_t)len);
|
||||
# ifdef FEAT_MBYTE
|
||||
if (enc_utf8)
|
||||
vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len);
|
||||
# endif
|
||||
vim_memset(ScreenAttrs + off, attr, (size_t)len);
|
||||
for (i = 0; i < len; ++i)
|
||||
ScreenAttrs[off + i] = attr;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -36,5 +36,5 @@
|
||||
#define VIM_VERSION_NODOT "vim70aa"
|
||||
#define VIM_VERSION_SHORT "7.0aa"
|
||||
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
|
||||
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 15)"
|
||||
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 15, compiled "
|
||||
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 18)"
|
||||
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 18, compiled "
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
* 29.08.96 Added size_t to strncmp() for Amiga.
|
||||
* 24.03.97 Windows NT support (Phil Hanna). Clean exit for Amiga WB (Bram)
|
||||
* 02.04.97 Added -E option, to have EBCDIC translation instead of ASCII
|
||||
* (antonio.colombo@jrc.it)
|
||||
* (azc10@yahoo.com)
|
||||
* 22.05.97 added -g (group octets) option (jcook@namerica.kla.com).
|
||||
* 23.09.98 nasty -p -r misfeature fixed: slightly wrong output, when -c was
|
||||
* missing or wrong.
|
||||
|
||||
Reference in New Issue
Block a user