diff options
| -rw-r--r-- | runtime/doc/Makefile | 44 | ||||
| -rw-r--r-- | runtime/doc/change.txt | 16 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 28 | ||||
| -rwxr-xr-x | runtime/doc/evim-it.1 | 2 | ||||
| -rw-r--r-- | runtime/doc/evim.1 | 2 | ||||
| -rw-r--r-- | runtime/doc/tags | 1 | ||||
| -rw-r--r-- | runtime/doc/vim.1 | 178 | ||||
| -rwxr-xr-x | runtime/doc/vimdiff-it.1 | 4 | ||||
| -rw-r--r-- | runtime/doc/xxd.1 | 22 | ||||
| -rw-r--r-- | runtime/filetype.vim | 226 | ||||
| -rw-r--r-- | runtime/lang/menu_it_it.latin1.vim | 4 | ||||
| -rw-r--r-- | runtime/syntax/awk.vim | 4 | ||||
| -rw-r--r-- | runtime/tutor/tutor.it | 2 | ||||
| -rw-r--r-- | src/Makefile | 33 | ||||
| -rw-r--r-- | src/fileio.c | 4 | ||||
| -rw-r--r-- | src/globals.h | 6 | ||||
| -rw-r--r-- | src/gui.c | 4 | ||||
| -rw-r--r-- | src/gui_motif.c | 2 | ||||
| -rw-r--r-- | src/message.c | 2 | ||||
| -rw-r--r-- | src/normal.c | 2 | ||||
| -rw-r--r-- | src/ops.c | 7 | ||||
| -rw-r--r-- | src/os_unix.c | 41 | ||||
| -rw-r--r-- | src/screen.c | 25 | ||||
| -rw-r--r-- | src/version.h | 4 | ||||
| -rw-r--r-- | src/xxd/xxd.c | 2 |
25 files changed, 391 insertions, 274 deletions
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index 0e66062edc..39208afb32 100644 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -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 $< >$@ diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 7ed249969e..7a58cd88cc 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -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: > diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 0e8d3fc261..8ff4bac067 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -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. diff --git a/runtime/doc/evim-it.1 b/runtime/doc/evim-it.1 index 644f793bb8..48e9a83ce2 100755 --- a/runtime/doc/evim-it.1 +++ b/runtime/doc/evim-it.1 @@ -25,7 +25,7 @@ maniera usuale. La modifica file sarà molto meno efficiente. .PP .B eview -come sopra, ma parte in modalità "Sola Lettura". Funziona come evim -R. +come sopra, ma parte in modalità "Sola Lettura". Funziona come evim \-R. .PP Vedere vim(1) per dettagli riguardo a Vim, opzioni, etc. .PP diff --git a/runtime/doc/evim.1 b/runtime/doc/evim.1 index bd25ed6eb5..bb859ceada 100644 --- a/runtime/doc/evim.1 +++ b/runtime/doc/evim.1 @@ -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 diff --git a/runtime/doc/tags b/runtime/doc/tags index 1cfff84565..87953dc6f7 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -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* diff --git a/runtime/doc/vim.1 b/runtime/doc/vim.1 index 6fa949b892..b98a96e2c8 100644 --- a/runtime/doc/vim.1 +++ b/runtime/doc/vim.1 @@ -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. diff --git a/runtime/doc/vimdiff-it.1 b/runtime/doc/vimdiff-it.1 index 9417b904cd..8d812283d1 100755 --- a/runtime/doc/vimdiff-it.1 +++ b/runtime/doc/vimdiff-it.1 @@ -34,8 +34,8 @@ L'opzione 'foldmethod' è impostata al valore "diff", che mette gruppi di linee uguali fra i diversi file in una piegatura. 'foldcolumn' è impostato a due per poter facilmente visualizzare le piegature, aprirle e chiuderle. .SH OPZIONI -Lo schermo è diviso verticalmente, come se aveste usato l'opzione "-O". -Per dividerlo orizzontalmente, usare l'opzione "-o". +Lo schermo è 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 diff --git a/runtime/doc/xxd.1 b/runtime/doc/xxd.1 index ccaeb2279d..304627596b 100644 --- a/runtime/doc/xxd.1 +++ b/runtime/doc/xxd.1 @@ -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 diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 768fd5dddf..6020a6765c 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -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 +" 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 + " Abaqus or Trasys -au BufNewFile,BufRead *.inp call FTCheck_inp() +au BufNewFile,BufRead *.inp call s:Check_inp() -fun! FTCheck_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 |