aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.0b01

Browse Source
This commit is contained in:
Bram Moolenaar
2006-03-25 22:02:07 +00:00
parent fa1d140a2c
commit 42bbef4a49
3 changed files with 190 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/doc/various.txt
View File

@@ -1,4 +1,4 @@
*various.txt* For Vim version 7.0b. Last change: 2006 Mar 21 *various.txt* For Vim version 7.0b. Last change: 2006 Mar 25
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@@ -760,6 +760,7 @@ At this moment translations are available for:
Chinese - multiple authors Chinese - multiple authors
French - translated by David Blanchet French - translated by David Blanchet
Italian - translated by Antonio Colombo Italian - translated by Antonio Colombo
Polish - translated by Mikolaj Machowski
Russian - translated by Vassily Ragosin Russian - translated by Vassily Ragosin
See the Vim website to find them: http://www.vim.org/translations.php See the Vim website to find them: http://www.vim.org/translations.php

7
src/dosinst.c
View File

@@ -361,7 +361,9 @@ find_bat_exe(int check_bat_only)
{ {
int i; int i;
mch_chdir(sysdrive); /* avoid looking in the "installdir" */ /* avoid looking in the "installdir" by chdir to system root */
mch_chdir(sysdrive);
mch_chdir("\\");
for (i = 1; i < TARGET_COUNT; ++i) for (i = 1; i < TARGET_COUNT; ++i)
{ {
@@ -376,7 +378,10 @@ find_bat_exe(int check_bat_only)
remove_tail(default_bat_dir); remove_tail(default_bat_dir);
} }
if (check_bat_only && targets[i].oldbat != NULL) if (check_bat_only && targets[i].oldbat != NULL)
{
free(targets[i].oldbat); free(targets[i].oldbat);
targets[i].oldbat = NULL;
}
} }
mch_chdir(installdir); mch_chdir(installdir);

246
src/syntax.c
View File

@@ -6063,89 +6063,207 @@ syn_get_foldlevel(wp, lnum)
* The default highlight groups. These are compiled-in for fast startup and * The default highlight groups. These are compiled-in for fast startup and
* they still work when the runtime files can't be found. * they still work when the runtime files can't be found.
* When making changes here, also change runtime/colors/default.vim! * When making changes here, also change runtime/colors/default.vim!
* The #ifdefs are needed to reduce the amount of static data. Helps to make
* the 16 bit DOS (museum) version compile.
*/ */
static char *(highlight_init_both[]) = static char *(highlight_init_both[]) =
{ {
"ErrorMsg term=standout ctermbg=DarkRed ctermfg=White",
"IncSearch term=reverse cterm=reverse",
"ModeMsg term=bold cterm=bold",
"NonText term=bold ctermfg=Blue",
"StatusLine term=reverse,bold cterm=reverse,bold",
"StatusLineNC term=reverse cterm=reverse",
#ifdef FEAT_VERTSPLIT
"VertSplit term=reverse cterm=reverse",
#endif
#ifdef FEAT_CLIPBOARD
"VisualNOS term=underline,bold cterm=underline,bold",
#endif
#ifdef FEAT_DIFF
"DiffText term=reverse cterm=bold ctermbg=Red",
#endif
#ifdef FEAT_INS_EXPAND
"PmenuThumb cterm=reverse",
"PmenuSbar ctermbg=Grey",
#endif
#ifdef FEAT_WINDOWS
"TabLineSel term=bold cterm=bold",
"TabLineFill term=reverse cterm=reverse",
#endif
#ifdef FEAT_AUTOCMD
"MatchParen term=reverse ctermbg=Cyan",
#endif
#ifdef FEAT_GUI #ifdef FEAT_GUI
"ErrorMsg guibg=Red guifg=White",
"IncSearch gui=reverse",
"ModeMsg gui=bold",
"NonText gui=bold guifg=Blue",
"StatusLine gui=reverse,bold",
"StatusLineNC gui=reverse",
"VertSplit gui=reverse",
"VisualNOS gui=underline,bold",
"DiffText gui=bold guibg=Red",
"PmenuThumb gui=reverse",
"PmenuSbar guibg=Grey",
"TabLineSel gui=bold",
"TabLineFill gui=reverse",
"MatchParen guibg=Cyan",
"Cursor guibg=fg guifg=bg", "Cursor guibg=fg guifg=bg",
"lCursor guibg=fg guifg=bg", /* should be different, but what? */ "lCursor guibg=fg guifg=bg", /* should be different, but what? */
#endif #endif
"ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White",
"IncSearch term=reverse cterm=reverse gui=reverse",
"ModeMsg term=bold cterm=bold gui=bold",
"NonText term=bold ctermfg=Blue gui=bold guifg=Blue",
"StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold",
"StatusLineNC term=reverse cterm=reverse gui=reverse",
"VertSplit term=reverse cterm=reverse gui=reverse",
"VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold",
"DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red",
"PmenuThumb cterm=reverse gui=reverse",
"PmenuSbar ctermbg=Grey guibg=Grey",
"TabLineSel term=bold cterm=bold gui=bold",
"TabLineFill term=reverse cterm=reverse gui=reverse",
"MatchParen term=reverse ctermbg=Cyan guibg=Cyan",
NULL NULL
}; };
static char *(highlight_init_light[]) = static char *(highlight_init_light[]) =
{ {
"Directory term=bold ctermfg=DarkBlue guifg=Blue", "Directory term=bold ctermfg=DarkBlue",
"LineNr term=underline ctermfg=Brown guifg=Brown", "LineNr term=underline ctermfg=Brown",
"MoreMsg term=bold ctermfg=DarkGreen gui=bold guifg=SeaGreen", "MoreMsg term=bold ctermfg=DarkGreen",
"Question term=standout ctermfg=DarkGreen",
"Search term=reverse ctermbg=Yellow ctermfg=NONE",
#ifdef FEAT_SPELL
"SpellBad term=reverse ctermbg=LightRed",
"SpellCap term=reverse ctermbg=LightBlue",
"SpellRare term=reverse ctermbg=LightMagenta",
"SpellLocal term=underline ctermbg=Cyan",
#endif
#ifdef FEAT_INS_EXPAND
"Pmenu ctermbg=LightMagenta",
"PmenuSel ctermbg=LightGrey",
#endif
"SpecialKey term=bold ctermfg=DarkBlue",
"Title term=bold ctermfg=DarkMagenta",
"WarningMsg term=standout ctermfg=DarkRed",
#ifdef FEAT_WILDMENU
"WildMenu term=standout ctermbg=Yellow ctermfg=Black",
#endif
#ifdef FEAT_FOLDING
"Folded term=standout ctermbg=Grey ctermfg=DarkBlue",
"FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue",
#endif
#ifdef FEAT_SIGNS
"SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue",
#endif
#ifdef FEAT_VISUAL
"Visual term=reverse ctermbg=Magenta",
#endif
#ifdef FEAT_DIFF
"DiffAdd term=bold ctermbg=LightBlue",
"DiffChange term=bold ctermbg=LightMagenta",
"DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan",
#endif
#ifdef FEAT_WINDOWS
"TabLine term=underline cterm=underline ctermfg=black ctermbg=LightGrey",
#endif
#ifdef FEAT_SYN_HL
"CursorColumn term=reverse ctermbg=LightGrey",
"CursorLine term=underline cterm=underline",
#endif
#ifdef FEAT_GUI
"Directory guifg=Blue",
"LineNr guifg=Brown",
"MoreMsg gui=bold guifg=SeaGreen",
"Normal gui=NONE", "Normal gui=NONE",
"Question term=standout ctermfg=DarkGreen gui=bold guifg=SeaGreen", "Question gui=bold guifg=SeaGreen",
"Search term=reverse ctermbg=Yellow ctermfg=NONE guibg=Yellow guifg=NONE", "Search guibg=Yellow guifg=NONE",
"SpellBad term=reverse ctermbg=LightRed guisp=Red gui=undercurl", "SpellBad guisp=Red gui=undercurl",
"SpellCap term=reverse ctermbg=LightBlue guisp=Blue gui=undercurl", "SpellCap guisp=Blue gui=undercurl",
"SpellRare term=reverse ctermbg=LightMagenta guisp=Magenta gui=undercurl", "SpellRare guisp=Magenta gui=undercurl",
"SpellLocal term=underline ctermbg=Cyan guisp=DarkCyan gui=undercurl", "SpellLocal guisp=DarkCyan gui=undercurl",
"Pmenu ctermbg=LightMagenta guibg=LightMagenta", "Pmenu guibg=LightMagenta",
"PmenuSel ctermbg=LightGrey guibg=Grey", "PmenuSel guibg=Grey",
"SpecialKey term=bold ctermfg=DarkBlue guifg=Blue", "SpecialKey guifg=Blue",
"Title term=bold ctermfg=DarkMagenta gui=bold guifg=Magenta", "Title gui=bold guifg=Magenta",
"WarningMsg term=standout ctermfg=DarkRed guifg=Red", "WarningMsg guifg=Red",
"WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black", "WildMenu guibg=Yellow guifg=Black",
"Folded term=standout ctermbg=Grey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue", "Folded guibg=LightGrey guifg=DarkBlue",
"FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue", "FoldColumn guibg=Grey guifg=DarkBlue",
"SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue", "SignColumn guibg=Grey guifg=DarkBlue",
"Visual term=reverse ctermbg=Magenta guibg=LightGrey", "Visual guibg=LightGrey",
"DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue", "DiffAdd guibg=LightBlue",
"DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta", "DiffChange guibg=LightMagenta",
"DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan", "DiffDelete gui=bold guifg=Blue guibg=LightCyan",
"TabLine term=underline cterm=underline ctermfg=black ctermbg=LightGrey gui=underline guibg=LightGrey", "TabLine gui=underline guibg=LightGrey",
"CursorColumn term=reverse ctermbg=LightGrey guibg=LightGrey", "CursorColumn guibg=LightGrey",
"CursorLine term=underline cterm=underline guibg=LightGrey", "CursorLine guibg=LightGrey",
#endif
NULL NULL
}; };
static char *(highlight_init_dark[]) = static char *(highlight_init_dark[]) =
{ {
"Directory term=bold ctermfg=LightCyan guifg=Cyan", "Directory term=bold ctermfg=LightCyan",
"LineNr term=underline ctermfg=Yellow guifg=Yellow", "LineNr term=underline ctermfg=Yellow",
"MoreMsg term=bold ctermfg=LightGreen gui=bold guifg=SeaGreen", "MoreMsg term=bold ctermfg=LightGreen",
"Question term=standout ctermfg=LightGreen",
"Search term=reverse ctermbg=Yellow ctermfg=Black",
"SpecialKey term=bold ctermfg=LightBlue",
#ifdef FEAT_SPELL
"SpellBad term=reverse ctermbg=Red",
"SpellCap term=reverse ctermbg=Blue",
"SpellRare term=reverse ctermbg=Magenta",
"SpellLocal term=underline ctermbg=Cyan",
#endif
#ifdef FEAT_INS_EXPAND
"Pmenu ctermbg=Magenta",
"PmenuSel ctermbg=DarkGrey",
#endif
"Title term=bold ctermfg=LightMagenta",
"WarningMsg term=standout ctermfg=LightRed",
#ifdef FEAT_WILDMENU
"WildMenu term=standout ctermbg=Yellow ctermfg=Black",
#endif
#ifdef FEAT_FOLDING
"Folded term=standout ctermbg=DarkGrey ctermfg=Cyan",
"FoldColumn term=standout ctermbg=DarkGrey ctermfg=Cyan",
#endif
#ifdef FEAT_SIGNS
"SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan",
#endif
#ifdef FEAT_VISUAL
"Visual term=reverse ctermbg=Magenta",
#endif
#ifdef FEAT_DIFF
"DiffAdd term=bold ctermbg=DarkBlue",
"DiffChange term=bold ctermbg=DarkMagenta",
"DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan",
#endif
#ifdef FEAT_WINDOWS
"TabLine term=underline cterm=underline ctermfg=white ctermbg=DarkGrey",
#endif
#ifdef FEAT_SYN_HL
"CursorColumn term=reverse ctermbg=DarkGrey",
"CursorLine term=underline cterm=underline",
#endif
#ifdef FEAT_GUI
"Directory guifg=Cyan",
"LineNr guifg=Yellow",
"MoreMsg gui=bold guifg=SeaGreen",
"Normal gui=NONE", "Normal gui=NONE",
"Question term=standout ctermfg=LightGreen gui=bold guifg=Green", "Question gui=bold guifg=Green",
"Search term=reverse ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black", "Search guibg=Yellow guifg=Black",
"SpecialKey term=bold ctermfg=LightBlue guifg=Cyan", "SpecialKey guifg=Cyan",
"SpellBad term=reverse ctermbg=Red guisp=Red gui=undercurl", "SpellBad guisp=Red gui=undercurl",
"SpellCap term=reverse ctermbg=Blue guisp=Blue gui=undercurl", "SpellCap guisp=Blue gui=undercurl",
"SpellRare term=reverse ctermbg=Magenta guisp=Magenta gui=undercurl", "SpellRare guisp=Magenta gui=undercurl",
"SpellLocal term=underline ctermbg=Cyan guisp=Cyan gui=undercurl", "SpellLocal guisp=Cyan gui=undercurl",
"Pmenu ctermbg=Magenta guibg=Magenta", "Pmenu guibg=Magenta",
"PmenuSel ctermbg=DarkGrey guibg=DarkGrey", "PmenuSel guibg=DarkGrey",
"Title term=bold ctermfg=LightMagenta gui=bold guifg=Magenta", "Title gui=bold guifg=Magenta",
"WarningMsg term=standout ctermfg=LightRed guifg=Red", "WarningMsg guifg=Red",
"WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black", "WildMenu guibg=Yellow guifg=Black",
"Folded term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=DarkGrey guifg=Cyan", "Folded guibg=DarkGrey guifg=Cyan",
"FoldColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan", "FoldColumn guibg=Grey guifg=Cyan",
"SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan", "SignColumn guibg=Grey guifg=Cyan",
"Visual term=reverse ctermbg=Magenta guibg=DarkGrey", "Visual guibg=DarkGrey",
"DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue", "DiffAdd guibg=DarkBlue",
"DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta", "DiffChange guibg=DarkMagenta",
"DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan", "DiffDelete gui=bold guifg=Blue guibg=DarkCyan",
"TabLine term=underline cterm=underline ctermfg=white ctermbg=DarkGrey gui=underline guibg=DarkGrey", "TabLine gui=underline guibg=DarkGrey",
"CursorColumn term=reverse ctermbg=DarkGrey guibg=DarkGrey", "CursorColumn guibg=DarkGrey",
"CursorLine term=underline cterm=underline guibg=DarkGrey", "CursorLine guibg=DarkGrey",
#endif
NULL NULL
}; };