aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.1b

Browse Source
This commit is contained in:
Bram Moolenaar 2007-05-10 19:06:20 +00:00
parent 3ad16f3fe6
commit 25394022f2
13 changed files with 69 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README_src.txt
View File

@ -1,4 +1,4 @@
README_src.txt for version 7.1a of Vim: Vi IMproved. README_src.txt for version 7.1b of Vim: Vi IMproved.
The source archive contains the files needed to compile Vim on Unix systems. The source archive contains the files needed to compile Vim on Unix systems.
It is packed for Unix systems (NL line separator). It is also used for other It is packed for Unix systems (NL line separator). It is also used for other

6
runtime/doc/ada.txt
View File

@ -1,4 +1,4 @@
*ada.txt* For Vim version 7.1a. Last change: 2006 Nov 12 *ada.txt* For Vim version 7.1b. Last change: 2007 May 08
ADA FILE TYPE PLUG-INS REFERENCE MANUAL~ ADA FILE TYPE PLUG-INS REFERENCE MANUAL~
@ -125,7 +125,7 @@ NOTE: "gnat xref -v" is very tricky to use as it has almost no diagnostic
3.2 Omni Completion with "ctags"~ 3.2 Omni Completion with "ctags"~
*ada-ctags* *ada-ctags*
Exuberant Ctags uses it's own multi-language code parser. The parser is quite Exuberant Ctags uses its own multi-language code parser. The parser is quite
fast, produces a lot of extra informations (hence the name "Exuberant Ctags") fast, produces a lot of extra informations (hence the name "Exuberant Ctags")
and can run on files which currently do not compile. and can run on files which currently do not compile.
@ -302,7 +302,7 @@ g:ada_folding set ('sigpft')
'x': lone 'exception' folded with line above 'x': lone 'exception' folded with line above
'i': activate indent folding on load 'i': activate indent folding on load
Note: Syntax folding is in an early (unuseable) stage and Note: Syntax folding is in an early (unusable) stage and
indent or gnat pretty folding is suggested. indent or gnat pretty folding is suggested.
For gnat pretty folding to work the following settings are For gnat pretty folding to work the following settings are

2
runtime/doc/remote.txt
View File

@ -1,4 +1,4 @@
*remote.txt* For Vim version 7.1a. Last change: 2006 Apr 30 *remote.txt* For Vim version 7.1b. Last change: 2006 Apr 30
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar

45
runtime/doc/syntax.txt
View File

@ -1,4 +1,4 @@
*syntax.txt* For Vim version 7.1a. Last change: 2007 May 03 *syntax.txt* For Vim version 7.1b. Last change: 2007 May 07
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -854,15 +854,16 @@ Doxygen generates code documentation using a special documentation format
(similar to Javadoc). This syntax script adds doxygen highlighting to c, cpp (similar to Javadoc). This syntax script adds doxygen highlighting to c, cpp
and idl files, and should also work with java. and idl files, and should also work with java.
There are a few of ways to turn on doxygen formatting. It can be done explicity There are a few of ways to turn on doxygen formatting. It can be done
or in a modeline by appending '.doxygen' to the syntax of the file. Example: > explicitly or in a modeline by appending '.doxygen' to the syntax of the file.
Example: >
:set syntax=c.doxygen :set syntax=c.doxygen
or > or >
// vim:syntax=c.doxygen // vim:syntax=c.doxygen
It can also be done automaticly for c, cpp and idl files by setting the global It can also be done automatically for c, cpp and idl files by setting the
or buffer-local variable load_doxygen_syntax. This is done by adding the global or buffer-local variable load_doxygen_syntax. This is done by adding
following to your .vimrc. > the following to your .vimrc. >
:let g:load_doxygen_syntax=1 :let g:load_doxygen_syntax=1
There are a couple of variables that have an affect on syntax highlighting, and There are a couple of variables that have an affect on syntax highlighting, and
@ -1291,7 +1292,7 @@ are recognized by the html.vim syntax coloring file and change the way normal
text is shown: <B> <I> <U> <EM> <STRONG> (<EM> is used as an alias for <I>, text is shown: <B> <I> <U> <EM> <STRONG> (<EM> is used as an alias for <I>,
while <STRONG> as an alias for <B>), <H1> - <H6>, <HEAD>, <TITLE> and <A>, but while <STRONG> as an alias for <B>), <H1> - <H6>, <HEAD>, <TITLE> and <A>, but
only if used as a link (that is, it must include a href as in only if used as a link (that is, it must include a href as in
<A href="somfile.html">). <A href="somefile.html">).
If you want to change how such text is rendered, you must redefine the If you want to change how such text is rendered, you must redefine the
following syntax groups: following syntax groups:
@ -1408,7 +1409,7 @@ Microsoft land, this is also used for defining COM interfaces and calls.
IDL's structure is simple enough to permit a full grammar based approach to IDL's structure is simple enough to permit a full grammar based approach to
rather than using a few heuristics. The result is large and somewhat rather than using a few heuristics. The result is large and somewhat
repetative but seems to work. repetitive but seems to work.
There are some Microsoft extensions to idl files that are here. Some of them There are some Microsoft extensions to idl files that are here. Some of them
are disabled by defining idl_no_ms_extensions. are disabled by defining idl_no_ms_extensions.
@ -2248,7 +2249,7 @@ experience slow redrawing (or you are on a terminal with poor color support)
you may want to turn it off by defining the "ruby_no_expensive" variable: > you may want to turn it off by defining the "ruby_no_expensive" variable: >
:let ruby_no_expensive = 1 :let ruby_no_expensive = 1
<
In this case the same color will be used for all control keywords. In this case the same color will be used for all control keywords.
If you do want this feature enabled, but notice highlighting errors while If you do want this feature enabled, but notice highlighting errors while
@ -2256,15 +2257,15 @@ scrolling backwards, which are fixed when redrawing with CTRL-L, try setting
the "ruby_minlines" variable to a value larger than 50: > the "ruby_minlines" variable to a value larger than 50: >
:let ruby_minlines = 100 :let ruby_minlines = 100
<
Ideally, this value should be a number of lines large enough to embrace your Ideally, this value should be a number of lines large enough to embrace your
largest class or module. largest class or module.
Highlighting of special identifiers can be disabled by defining Highlighting of special identifiers can be disabled by removing the
"ruby_no_identifiers": > rubyIdentifier highlighting: >
:let ruby_no_identifiers = 1
:hi link rubyIdentifier NONE
<
This will prevent highlighting of special identifiers like "ConstantName", This will prevent highlighting of special identifiers like "ConstantName",
"$global_var", "@@class_var", "@instance_var", "| block_param |", and "$global_var", "@@class_var", "@instance_var", "| block_param |", and
":symbol". ":symbol".
@ -2273,14 +2274,19 @@ Significant methods of Kernel, Module and Object are highlighted by default.
This can be disabled by defining "ruby_no_special_methods": > This can be disabled by defining "ruby_no_special_methods": >
:let ruby_no_special_methods = 1 :let ruby_no_special_methods = 1
<
This will prevent highlighting of important methods such as "require", "attr", This will prevent highlighting of important methods such as "require", "attr",
"private", "raise" and "proc". "private", "raise" and "proc".
Ruby operators can be highlighted. This is enabled by defining
"ruby_operators": >
:let ruby_operators = 1
<
Whitespace errors can be highlighted by defining "ruby_space_errors": > Whitespace errors can be highlighted by defining "ruby_space_errors": >
:let ruby_space_errors = 1 :let ruby_space_errors = 1
<
This will highlight trailing whitespace and tabs preceded by a space character This will highlight trailing whitespace and tabs preceded by a space character
as errors. This can be refined by defining "ruby_no_trail_space_error" and as errors. This can be refined by defining "ruby_no_trail_space_error" and
"ruby_no_tab_space_error" which will ignore trailing whitespace and tabs after "ruby_no_tab_space_error" which will ignore trailing whitespace and tabs after
@ -2289,10 +2295,15 @@ spaces respectively.
Folding can be enabled by defining "ruby_fold": > Folding can be enabled by defining "ruby_fold": >
:let ruby_fold = 1 :let ruby_fold = 1
<
This will set the 'foldmethod' option to "syntax" and allow folding of This will set the 'foldmethod' option to "syntax" and allow folding of
classes, modules, methods, code blocks, heredocs and comments. classes, modules, methods, code blocks, heredocs and comments.
Folding of multiline comments can be disabled by defining
"ruby_no_comment_fold": >
:let ruby_no_comment_fold = 1
<
SCHEME *scheme.vim* *ft-scheme-syntax* SCHEME *scheme.vim* *ft-scheme-syntax*

2
runtime/doc/usr_30.txt
View File

@ -1,4 +1,4 @@
*usr_30.txt* For Vim version 7.1a. Last change: 2007 Apr 22 *usr_30.txt* For Vim version 7.1b. Last change: 2007 Apr 22
VIM USER MANUAL - by Bram Moolenaar VIM USER MANUAL - by Bram Moolenaar

3
runtime/indent/config.vim
View File

@ -1,7 +1,7 @@
" Vim indent file " Vim indent file
" Language: Autoconf configure.{ac,in} file " Language: Autoconf configure.{ac,in} file
" Maintainer: Nikolai Weibull <now@bitwi.se> " Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2006-04-19 " Latest Revision: 2006-12-20
" TODO: how about nested [()]'s in one line " TODO: how about nested [()]'s in one line
" what's wrong with '\\\@!'? " what's wrong with '\\\@!'?
@ -14,6 +14,7 @@ runtime! indent/sh.vim " will set b:did_indent
setlocal indentexpr=GetConfigIndent() setlocal indentexpr=GetConfigIndent()
setlocal indentkeys=!^F,o,O,=then,=do,=else,=elif,=esac,=fi,=fin,=fil,=done setlocal indentkeys=!^F,o,O,=then,=do,=else,=elif,=esac,=fi,=fin,=fil,=done
setlocal nosmartindent
" Only define the function once. " Only define the function once.
if exists("*GetConfigIndent") if exists("*GetConfigIndent")

5
runtime/indent/xf86conf.vim
View File

@ -1,7 +1,7 @@
" Vim indent file " Vim indent file
" Language: XFree86 Configuration File " Language: XFree86 Configuration File
" Maintainer: Nikolai Weibull <now@bitwi.se> " Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2006-04-19 " Latest Revision: 2006-12-20
if exists("b:did_indent") if exists("b:did_indent")
finish finish
@ -10,6 +10,7 @@ let b:did_indent = 1
setlocal indentexpr=GetXF86ConfIndent() setlocal indentexpr=GetXF86ConfIndent()
setlocal indentkeys=!^F,o,O,=End setlocal indentkeys=!^F,o,O,=End
setlocal nosmartindent
if exists("*GetXF86ConfIndent") if exists("*GetXF86ConfIndent")
finish finish
@ -28,7 +29,7 @@ function GetXF86ConfIndent()
let ind = ind + &sw let ind = ind + &sw
endif endif
if getline(v:lnum) =~? '^\s*End\>' if getline(v:lnum) =~? '^\s*End\(Sub\)\=Section\>'
let ind = ind - &sw let ind = ind - &sw
endif endif

7
runtime/syntax/context.vim
View File

@ -1,13 +1,14 @@
" Vim syntax file " Vim syntax file
" Language: ConTeXt typesetting engine " Language: ConTeXt typesetting engine
" Maintainer: Nikolai Weibull <now@bitwi.se> " Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2006-04-19 " Latest Revision: 2006-08-10
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
endif endif
runtime! syntax/plaintex.vim runtime! syntax/plaintex.vim
unlet b:current_syntax
let s:cpo_save = &cpo let s:cpo_save = &cpo
set cpo&vim set cpo&vim
@ -16,6 +17,8 @@ if !exists('g:context_include')
let g:context_include = ['mp', 'javascript', 'xml'] let g:context_include = ['mp', 'javascript', 'xml']
endif endif
syn spell toplevel
syn match contextBlockDelim display '\\\%(start\|stop\)\a\+' syn match contextBlockDelim display '\\\%(start\|stop\)\a\+'
\ contains=@NoSpell \ contains=@NoSpell
@ -27,7 +30,7 @@ syn region contextEscaped display matchgroup=contextPreProc
\ start='\\type\=<<' end='>>' \ start='\\type\=<<' end='>>'
syn region contextEscaped matchgroup=contextPreProc syn region contextEscaped matchgroup=contextPreProc
\ start='\\start\z(\a*\%(typing\|typen\)\)' \ start='\\start\z(\a*\%(typing\|typen\)\)'
\ end='\\stop\z1' \ end='\\stop\z1' contains=plaintexComment keepend
syn region contextEscaped display matchgroup=contextPreProc syn region contextEscaped display matchgroup=contextPreProc
\ start='\\\h\+Type{' end='}' \ start='\\\h\+Type{' end='}'
syn region contextEscaped display matchgroup=contextPreProc syn region contextEscaped display matchgroup=contextPreProc

10
runtime/syntax/rst.vim
View File

@ -1,7 +1,7 @@
" Vim syntax file " Vim syntax file
" Language: reStructuredText documentation format " Language: reStructuredText documentation format
" Maintainer: Nikolai Weibull <now@bitwi.se> " Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2006-04-09 " Latest Revision: 2006-07-04
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
@ -50,7 +50,7 @@ syn match rstSimpleTableLines contained display
syn cluster rstDirectives contains=rstFootnote,rstCitation, syn cluster rstDirectives contains=rstFootnote,rstCitation,
\ rstHyperlinkTarget,rstExDirective \ rstHyperlinkTarget,rstExDirective
syn match rstExplicitMarkup '^\.\.\s' syn match rstExplicitMarkup '^\.\.\_s'
\ nextgroup=@rstDirectives,rstComment,rstSubstitutionDefinition \ nextgroup=@rstDirectives,rstComment,rstSubstitutionDefinition
let s:ReferenceName = '[[:alnum:]]\+\%([_.-][[:alnum:]]\+\)*' let s:ReferenceName = '[[:alnum:]]\+\%([_.-][[:alnum:]]\+\)*'
@ -91,7 +91,7 @@ execute 'syn match rstSubstitutionDefinition contained' .
function! s:DefineOneInlineMarkup(name, start, middle, end, char_left, char_right) function! s:DefineOneInlineMarkup(name, start, middle, end, char_left, char_right)
execute 'syn region rst' . a:name . execute 'syn region rst' . a:name .
\ ' start=+' . a:char_left . '\zs' . a:start . \ ' start=+' . a:char_left . '\zs' . a:start .
\ '[^[:space:]' . a:char_right . a:start[strlen(a:start) - 1] . ']+' . \ '\ze[^[:space:]' . a:char_right . a:start[strlen(a:start) - 1] . ']+' .
\ a:middle . \ a:middle .
\ ' end=+\S' . a:end . '\ze\%($\|\s\|[''")\]}>/:.,;!?\\-]\)+' \ ' end=+\S' . a:end . '\ze\%($\|\s\|[''")\]}>/:.,;!?\\-]\)+'
endfunction endfunction
@ -130,10 +130,10 @@ execute 'syn match rstFootnoteReference contains=@NoSpell' .
\ ' +\[\%(\d\+\|#\%(' . s:ReferenceName . '\)\=\|\*\)\]_+' \ ' +\[\%(\d\+\|#\%(' . s:ReferenceName . '\)\=\|\*\)\]_+'
execute 'syn match rstCitationReference contains=@NoSpell' . execute 'syn match rstCitationReference contains=@NoSpell' .
\ ' +\[' . s:ReferenceName . '\]_+' \ ' +\[' . s:ReferenceName . '\]_\ze\%($\|\s\|[''")\]}>/:.,;!?\\-]\)+'
execute 'syn match rstHyperlinkReference' . execute 'syn match rstHyperlinkReference' .
\ ' /\<' . s:ReferenceName . '__\=/' \ ' /\<' . s:ReferenceName . '__\=\ze\%($\|\s\|[''")\]}>/:.,;!?\\-]\)/'
syn match rstStandaloneHyperlink contains=@NoSpell syn match rstStandaloneHyperlink contains=@NoSpell
\ "\<\%(\%(\%(https\=\|file\|ftp\|gopher\)://\|\%(mailto\|news\):\)[^[:space:]'\"<>]\+\|www[[:alnum:]_-]*\.[[:alnum:]_-]\+\.[^[:space:]'\"<>]\+\)[[:alnum:]/]" \ "\<\%(\%(\%(https\=\|file\|ftp\|gopher\)://\|\%(mailto\|news\):\)[^[:space:]'\"<>]\+\|www[[:alnum:]_-]*\.[[:alnum:]_-]\+\.[^[:space:]'\"<>]\+\)[[:alnum:]/]"

4
src/farsi.c
View File

@ -655,7 +655,7 @@ chg_l_to_X_orX_ ()
} }
/* /*
** Change the charcter left to the cursor to a X or _X type ** Change the character left to the cursor to a X or _X type
*/ */
static void static void
@ -724,7 +724,7 @@ chg_l_toXor_X ()
} }
/* /*
** Change the charcter right to the cursor to a _X or _X_ type ** Change the character right to the cursor to a _X or _X_ type
*/ */
static void static void

2
src/farsi.h
View File

@ -7,7 +7,7 @@
*/ */
/* /*
* Farsi characters are catagorized into following types: * Farsi characters are categorized into following types:
* *
* TyA (for capital letter representation) * TyA (for capital letter representation)
* TyB (for types that look like _X e.g. AYN) * TyB (for types that look like _X e.g. AYN)

8
src/fold.c
View File

@ -2684,7 +2684,7 @@ foldUpdateIEMSRecurse(gap, level, startlnum, flp, getlevel, bot, topflags)
{ {
if (fp->fd_top + fp->fd_len > bot + 1) if (fp->fd_top + fp->fd_len > bot + 1)
{ {
/* fold coninued below bot */ /* fold continued below bot */
if (getlevel == foldlevelMarker if (getlevel == foldlevelMarker
|| getlevel == foldlevelExpr || getlevel == foldlevelExpr
|| getlevel == foldlevelSyntax) || getlevel == foldlevelSyntax)
@ -2834,7 +2834,7 @@ foldSplit(gap, i, top, bot)
* 3 5 6 * 3 5 6
* *
* 1: not changed * 1: not changed
* 2: trunate to stop above "top" * 2: truncate to stop above "top"
* 3: split in two parts, one stops above "top", other starts below "bot". * 3: split in two parts, one stops above "top", other starts below "bot".
* 4: deleted * 4: deleted
* 5: made to start below "bot". * 5: made to start below "bot".
@ -2900,8 +2900,8 @@ foldRemove(gap, top, bot)
/* foldMerge() {{{2 */ /* foldMerge() {{{2 */
/* /*
* Merge two adjecent folds (and the nested ones in them). * Merge two adjacent folds (and the nested ones in them).
* This only works correctly when the folds are really adjecent! Thus "fp1" * This only works correctly when the folds are really adjacent! Thus "fp1"
* must end just above "fp2". * must end just above "fp2".
* The resulting fold is "fp1", nested folds are moved from "fp2" to "fp1". * The resulting fold is "fp1", nested folds are moved from "fp2" to "fp1".
* Fold entry "fp2" in "gap" is deleted. * Fold entry "fp2" in "gap" is deleted.

14
src/misc1.c
View File

@ -3727,7 +3727,7 @@ expand_env_esc(srcp, dst, dstlen, esc, startstr)
if (copy_char) /* copy at least one char */ if (copy_char) /* copy at least one char */
{ {
/* /*
* Recogize the start of a new name, for '~'. * Recognize the start of a new name, for '~'.
*/ */
at_start = FALSE; at_start = FALSE;
if (src[0] == '\\' && src[1] != NUL) if (src[0] == '\\' && src[1] != NUL)
@ -4451,7 +4451,7 @@ vim_ispathlistsep(c)
#ifdef UNIX #ifdef UNIX
return (c == ':'); return (c == ':');
#else #else
return (c == ';'); /* might not be rigth for every system... */ return (c == ';'); /* might not be right for every system... */
#endif #endif
} }
#endif #endif
@ -4561,7 +4561,7 @@ vim_fnamencmp(x, y, len)
/* /*
* Concatenate file names fname1 and fname2 into allocated memory. * Concatenate file names fname1 and fname2 into allocated memory.
* Only add a '/' or '\\' when 'sep' is TRUE and it is neccesary. * Only add a '/' or '\\' when 'sep' is TRUE and it is necessary.
*/ */
char_u * char_u *
concat_fnames(fname1, fname2, sep) concat_fnames(fname1, fname2, sep)
@ -7118,7 +7118,7 @@ get_c_indent()
/* /*
* What happens next depends on the line being terminated. * What happens next depends on the line being terminated.
* If terminated with a ',' only consider it terminating if * If terminated with a ',' only consider it terminating if
* there is anoter unterminated statement behind, eg: * there is another unterminated statement behind, eg:
* 123, * 123,
* sizeof * sizeof
* here * here
@ -7306,7 +7306,7 @@ get_c_indent()
/* /*
* If we're below an unterminated line that is not an * If we're below an unterminated line that is not an
* "if" or something, we may line up with this line or * "if" or something, we may line up with this line or
* add someting for a continuation line, depending on * add something for a continuation line, depending on
* the line before this one. * the line before this one.
*/ */
else else
@ -8513,7 +8513,7 @@ dos_expandpath(
char_u *path, char_u *path,
int wildoff, int wildoff,
int flags, /* EW_* flags */ int flags, /* EW_* flags */
int didstar) /* expaneded "**" once already */ int didstar) /* expanded "**" once already */
{ {
char_u *buf; char_u *buf;
char_u *path_end; char_u *path_end;
@ -9340,7 +9340,7 @@ get_cmd_output(cmd, infile, flags)
* read the names from the file into memory * read the names from the file into memory
*/ */
# ifdef VMS # ifdef VMS
/* created temporary file is not allways readable as binary */ /* created temporary file is not always readable as binary */
fd = mch_fopen((char *)tempname, "r"); fd = mch_fopen((char *)tempname, "r");
# else # else
fd = mch_fopen((char *)tempname, READBIN); fd = mch_fopen((char *)tempname, READBIN);