-*eval.txt* For Vim version 7.0aa. Last change: 2005 Mar 07
+*eval.txt* For Vim version 7.0aa. Last change: 2005 Mar 15
VIM REFERENCE MANUAL by Bram Moolenaar
Using expressions is introduced in chapter 41 of the user manual |usr_41.txt|.
Note: Expression evaluation can be disabled at compile time. If this has been
-done, the features in this document are not available. See |+eval| and
+done, the features in this document are not available. See |+eval| and
|no-eval-feature|.
1. Variables |variables|
adict.
Weeding out entries from a Dictionary can be done with |filter()|: >
- :call filter(dict 'v:val =~ "x"')
+ :call filter(dict 'v:val =~ "x"')
This removes all entries from "dict" with a value not matching 'x'.
empty( {expr}) Number TRUE if {expr} is empty
errorlist() List list of quickfix items
escape( {string}, {chars}) String escape {chars} in {string} with '\'
-eval( {string}) any evaluate {string} into its value
+eval( {string}) any evaluate {string} into its value
eventhandler( ) Number TRUE if inside an event handler
executable( {expr}) Number 1 if executable {expr} exists
exists( {expr}) Number TRUE if {expr} exists
String attribute {what} of syntax ID {synID}
synIDtrans( {synID}) Number translated syntax ID of {synID}
system( {expr} [, {input}]) String output of shell command/filter {expr}
+taglist({expr}) List list of tags matching {expr}
tempname() String name for a temporary file
tolower( {expr}) String the String {expr} switched to lowercase
toupper( {expr}) String the String {expr} switched to uppercase
:echo getfperm("/etc/passwd")
< This will hopefully (from a security point of view) display
the string "rw-r--r--" or even "rw-------".
-
+
getftime({fname}) *getftime()*
The result is a Number, which is the last modification time of
the given file {fname}. The value is measured as seconds
:let comma1 = stridx(line, ",")
:let comma2 = stridx(line, ",", comma1 + 1)
< The search is done case-sensitive.
- For pattern searches use |match()|.
+ For pattern searches use |match()|.
-1 is returned if the {needle} does not occur in {haystack}.
See also |strridx()|.
Examples: >
"reverse" "1" if reverse
"inverse" "1" if inverse (= reverse)
"underline" "1" if underlined
+ "undercurl" "1" if undercurled
Example (echoes the color of the syntax item under the
cursor): >
Unlike ":!cmd" there is no automatic check for changed files.
Use |:checktime| to force a check.
+
+taglist({expr}) *taglist()*
+ Returns a list of tags matching the regular expression {expr}.
+ Each list item is a dictionary with the following entries:
+ name name of the tag.
+ filename name of the file where the tag is
+ defined.
+ cmd Ex command used to locate the tag in
+ the file.
+ kind type of the tag. The value for this
+ entry depends on the language specific
+ kind values generated by the ctags
+ 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.
+
+ If there are no matching tags, then an empty list is returned.
+
+ To get an exact tag match, the anchors '^' and '$' should be
+ used in {expr}. Refer to |tag-regexp| for more information
+ about the tag search regular expression pattern.
+
+ Refer to |'tags'| for information about how the tags file is
+ located by Vim. Refer to |tags-file-format| for the format of
+ the tags file generated by the different ctags tools.
+
+
tempname() *tempname()* *temp-file-name*
The result is a String, which is the name of a file that
doesn't exist. It can be used for a temporary file. The name
-*options.txt* For Vim version 7.0aa. Last change: 2005 Mar 10
+*options.txt* For Vim version 7.0aa. Last change: 2005 Mar 14
VIM REFERENCE MANUAL by Bram Moolenaar
b bold (termcap entry "md" and "me")
s standout (termcap entry "so" and "se")
u underline (termcap entry "us" and "ue")
+ c undercurl (termcap entry "Cs" and "Ce")
n no highlighting
- no highlighting
: use a highlight group
't_AL' term.txt /*'t_AL'*
't_CS' term.txt /*'t_CS'*
't_CV' term.txt /*'t_CV'*
+'t_Ce' term.txt /*'t_Ce'*
't_Co' term.txt /*'t_Co'*
+'t_Cs' term.txt /*'t_Cs'*
't_DL' term.txt /*'t_DL'*
't_EI' term.txt /*'t_EI'*
't_F1' term.txt /*'t_F1'*
hebrew.txt hebrew.txt /*hebrew.txt*
help various.txt /*help*
help-context help.txt /*help-context*
+help-tags tags 1
help-translated various.txt /*help-translated*
help-xterm-window various.txt /*help-xterm-window*
help.txt help.txt /*help.txt*
highlight-gui syntax.txt /*highlight-gui*
highlight-guibg syntax.txt /*highlight-guibg*
highlight-guifg syntax.txt /*highlight-guifg*
+highlight-guisp syntax.txt /*highlight-guisp*
highlight-start syntax.txt /*highlight-start*
highlight-stop syntax.txt /*highlight-stop*
highlight-term syntax.txt /*highlight-term*
t_AL term.txt /*t_AL*
t_CS term.txt /*t_CS*
t_CV term.txt /*t_CV*
+t_Ce term.txt /*t_Ce*
t_Co term.txt /*t_Co*
+t_Cs term.txt /*t_Cs*
t_DL term.txt /*t_DL*
t_EI term.txt /*t_EI*
t_F1 term.txt /*t_F1*
-*usr_10.txt* For Vim version 7.0aa. Last change: 2004 Mar 12
+*usr_10.txt* For Vim version 7.0aa. Last change: 2005 Mar 15
VIM USER MANUAL - by Bram Moolenaar
insert command and affects only the first line of the block.
The "A" command works the same way, except that it appends after the right
-side of the block.
+side of the block. And it does insert text in a short line. Thus you can
+make a choice whether you do or don't want to append text to a short line.
There is one special case for "A": Select a Visual block and then use "$"
to make the block extend to the end of each line. Using "A" now will append
the text to the end of each line.
" You can also use this as a start for your own set of menus.
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2005 Feb 24
+" Last Change: 2005 Mar 15
" Note that ":an" (short for ":anoremenu") is often used to make a menu work
" in all modes and avoid side effects from mappings defined by the user.
let s:lang = substitute(s:lang, '\.[^.]*', "", "")
exe "runtime! lang/menu_" . s:lang . "[^a-z]*vim"
- if !exists("did_menu_trans") && strlen($LANG) > 1
+ if !exists("did_menu_trans") && strlen($LANG) > 1 && s:lang !~ '^en_us'
" On windows locale names are complicated, try using $LANG, it might
- " have been set by set_init_1().
+ " have been set by set_init_1(). But don't do this for "en" or "en_us".
" But don't match "slovak" when $LANG is "sl".
exe "runtime! lang/menu_" . tolower($LANG) . "[^a-z]*vim"
endif
if !has("gui_athena")
an 1.95 ToolBar.-sep3- <Nop>
- an 1.100 ToolBar.Find :promptfind<CR>
- vunmenu ToolBar.Find
- vnoremenu ToolBar.Find y:promptfind <C-R>"<CR>
- an 1.110 ToolBar.FindNext n
- an 1.120 ToolBar.FindPrev N
- an 1.130 ToolBar.Replace :promptrepl<CR>
+ an 1.100 ToolBar.Replace :promptrepl<CR>
vunmenu ToolBar.Replace
vnoremenu ToolBar.Replace y:promptrepl <C-R>"<CR>
+ an 1.110 ToolBar.FindNext n
+ an 1.120 ToolBar.FindPrev N
endif
-if 0 " disabled; These are in the Windows menu
- an 1.135 ToolBar.-sep4- <Nop>
- an 1.140 ToolBar.New <C-W>n
- an 1.150 ToolBar.WinSplit <C-W>s
- an 1.160 ToolBar.WinMax :resize 200<CR>
- an 1.170 ToolBar.WinMin :resize 1<CR>
- an 1.180 ToolBar.WinVSplit <C-W>v
- an 1.190 ToolBar.WinMaxWidth <C-W>500>
- an 1.200 ToolBar.WinMinWidth <C-W>1\|
- an 1.210 ToolBar.WinClose :close<CR>
-endif
-
an 1.215 ToolBar.-sep5- <Nop>
an <silent> 1.220 ToolBar.LoadSesn :call <SID>LoadVimSesn()<CR>
an <silent> 1.230 ToolBar.SaveSesn :call <SID>SaveVimSesn()<CR>
tmenu ToolBar.FindPrev Find Previous
tmenu ToolBar.Replace Find / Replace...
endif
- if 0 " disabled; These are in the Windows menu
- tmenu ToolBar.New New Window
- tmenu ToolBar.WinSplit Split Window
- tmenu ToolBar.WinMax Maximise Window
- tmenu ToolBar.WinMin Minimise Window
- tmenu ToolBar.WinVSplit Split Window Vertically
- tmenu ToolBar.WinMaxWidth Maximise Window Width
- tmenu ToolBar.WinMinWidth Minimise Window Width
- tmenu ToolBar.WinClose Close Window
- endif
- tmenu ToolBar.LoadSesn Load session
+ tmenu ToolBar.LoadSesn Chose a session to load
tmenu ToolBar.SaveSesn Save current session
- tmenu ToolBar.RunScript Run a Vim Script
- tmenu ToolBar.Make Make current project
- tmenu ToolBar.RunCtags Build tags in current directory tree
+ tmenu ToolBar.RunScript Chose a Vim Script to run
+ tmenu ToolBar.Make Make current project (:make)
+ tmenu ToolBar.RunCtags Build tags in current directory tree (!ctags -R .)
tmenu ToolBar.TagJump Jump to tag under cursor
tmenu ToolBar.Help Vim Help
tmenu ToolBar.FindHelp Search Vim Help
" Vim tutor support file
" Author: Eduardo F. Amatria <eferna1@platea.pntic.mec.es>
-" Last Change: 2004 Sep 06
+" Last Change: 2005 Mar 15
" This small source file is used for detecting if a translation of the
" tutor file exist, i.e., a tutor.xx file, where xx is the language.
let s:ext = "." . $xx
else
let s:lang = ""
- if exists("v:lang") && v:lang != "C"
+ if exists("v:lang")
let s:lang = v:lang
- elseif strlen($LANG) > 0 && $LANG != "C"
+ elseif strlen($LC_ALL) > 0
+ let s:lang = $LC_ALL
+ elseif strlen($LANG) > 0
let s:lang = $LANG
endif
+ if s:lang == "C"
+ let s:lang = ""
+ endif
if s:lang != ""
" Remove "@euro" (ignoring case), it may be at the end
let s:lang = substitute(s:lang, '\c@euro', '', '')
line = sp->nextline;
sp->nextline = NULL;
++sourcing_lnum;
+ }
#ifdef FEAT_PROFILE
- if (do_profiling)
- script_line_start();
+ if (line != NULL && do_profiling)
+ script_line_start();
#endif
- }
/* Only concatenate lines starting with a \ when 'cpoptions' doesn't
* contain the 'C' flag. */
static void
prt_get_attr(hl_id, pattr, modec)
int hl_id;
- prt_text_attr_T* pattr;
+ prt_text_attr_T *pattr;
int modec;
{
int colorindex;
pattr->bold = (highlight_has_attr(hl_id, HL_BOLD, modec) != NULL);
pattr->italic = (highlight_has_attr(hl_id, HL_ITALIC, modec) != NULL);
pattr->underline = (highlight_has_attr(hl_id, HL_UNDERLINE, modec) != NULL);
+ pattr->undercurl = (highlight_has_attr(hl_id, HL_UNDERCURL, modec) != NULL);
# ifdef FEAT_GUI
if (gui.in_use)
gui.w->painter->setBackgroundColor(rgb);
}//}}}
+/*
+ * Set the current text special color.
+ */
+ void
+gui_mch_set_sp_color(guicolor_T color)//{{{
+{
+ /* TODO */
+}//}}}
+
/*
* Use the blank mouse pointer or not.
*
PgSetFillColor( color );
}
+ void
+gui_mch_set_sp_color(guicolor_T color)
+{
+}
+
void
gui_mch_invert_rectangle(int row, int col, int nr, int nc)
{
gui.currBgColor = color;
}
+/*
+ * Set the current text special color.
+ */
+ void
+gui_mch_set_sp_color(guicolor_T color)
+{
+ gui.currSpColor = color;
+}
+
#if defined(FEAT_MBYTE) && defined(FEAT_MBYTE_IME)
/*
* Multi-byte handling, originally by Sung-Hoon Baek.
foptions, pcliprect, (char *)text, len, padding);
}
+ /* Underline */
if (flags & DRAW_UNDERL)
{
hpen = CreatePen(PS_SOLID, 1, gui.currFgColor);
LineTo(s_hdc, FILL_X(col + len), y);
DeleteObject(SelectObject(s_hdc, old_pen));
}
+
+ /* Undercurl */
+ if (flags & DRAW_UNDERC)
+ {
+ int x;
+ int offset;
+ const static int val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
+
+ y = FILL_Y(row + 1) - 1;
+ for (x = FILL_X(col); x < FILL_X(col + len); ++x)
+ {
+ offset = val[x % 8];
+ SetPixel(s_hdc, x, y - offset, gui.currSpColor);
+ }
+ }
}
cur_beval->x = pt.x;
cur_beval->y = pt.y;
- TRACE0("BevalTimerProc: sending request");
+ // TRACE0("BevalTimerProc: sending request");
if (cur_beval->msgCB != NULL)
(*cur_beval->msgCB)(cur_beval, 0);
gui_mch_disable_beval_area(beval)
BalloonEval *beval;
{
- TRACE0("gui_mch_disable_beval_area {{{");
+ // TRACE0("gui_mch_disable_beval_area {{{");
KillTimer(s_textArea, BevalTimerId);
- TRACE0("gui_mch_disable_beval_area }}}");
+ // TRACE0("gui_mch_disable_beval_area }}}");
}
void
gui_mch_enable_beval_area(beval)
BalloonEval *beval;
{
- TRACE0("gui_mch_enable_beval_area |||");
+ // TRACE0("gui_mch_enable_beval_area |||");
if (beval == NULL)
return;
- TRACE0("gui_mch_enable_beval_area {{{");
+ // TRACE0("gui_mch_enable_beval_area {{{");
BevalTimerId = SetTimer(s_textArea, 0, p_bdlay / 2,
(TIMERPROC)BevalTimerProc);
- TRACE0("gui_mch_enable_beval_area }}}");
+ // TRACE0("gui_mch_enable_beval_area }}}");
}
void
char_u *mesg;
{
POINT pt;
- TRACE0("gui_mch_post_balloon {{{");
+ // TRACE0("gui_mch_post_balloon {{{");
if (beval->showState == ShS_SHOWING)
return;
GetCursorPos(&pt);
beval->showState = ShS_SHOWING;
make_tooltip(beval, mesg, pt);
}
- TRACE0("gui_mch_post_balloon }}}");
+ // TRACE0("gui_mch_post_balloon }}}");
}
BalloonEval *
{
if (pnmh->code == TTN_SHOW)
{
- TRACE0("TTN_SHOW {{{");
- TRACE0("TTN_SHOW }}}");
+ // TRACE0("TTN_SHOW {{{");
+ // TRACE0("TTN_SHOW }}}");
}
else if (pnmh->code == TTN_POP) /* Before tooltip disappear */
{
- TRACE0("TTN_POP {{{");
+ // TRACE0("TTN_POP {{{");
delete_tooltip(cur_beval);
gui_mch_enable_beval_area(cur_beval);
- TRACE0("TTN_POP }}}");
+ // TRACE0("TTN_POP }}}");
cur_beval->showState = ShS_NEUTRAL;
}
/* redisplay now, so message is not deleted */
update_topline_redraw();
if (yanklines == 1)
- MSG(_("1 line yanked"));
+ {
+#ifdef FEAT_VISUAL
+ if (oap->block_mode)
+ MSG(_("block of 1 line yanked"));
+ else
+#endif
+ MSG(_("1 line yanked"));
+ }
+#ifdef FEAT_VISUAL
+ else if (oap->block_mode)
+ smsg((char_u *)_("block of %ld lines yanked"), yanklines);
+#endif
else
smsg((char_u *)_("%ld lines yanked"), yanklines);
}
out_str(T_MD);
if ((attr & HL_STANDOUT) && T_SO != NULL) /* standout */
out_str(T_SO);
- if ((attr & HL_UNDERLINE) && T_US != NULL) /* underline */
+ if ((attr & (HL_UNDERLINE | HL_UNDERCURL)) && T_US != NULL)
+ /* underline or undercurl */
out_str(T_US);
if ((attr & HL_ITALIC) && T_CZH != NULL) /* italic */
out_str(T_CZH);
else
out_str(T_SE);
}
- if (screen_attr & HL_UNDERLINE)
+ if (screen_attr & (HL_UNDERLINE | HL_UNDERCURL))
{
if (STRCMP(T_UE, T_ME) == 0)
do_ME = TRUE;
int row;
int col;
{
- char_u *p;
+ sattr_T *p;
int i;
int plan;
int cost;
{
guicolor_T fg_color; /* foreground color handle */
guicolor_T bg_color; /* background color handle */
+ guicolor_T sp_color; /* special color handle */
GuiFont font; /* font handle */
# ifdef FEAT_XFONTSET
GuiFontset fontset; /* fontset handle */
int bold;
int italic;
int underline;
+ int undercurl;
} prt_text_attr_T;
/*
char_u *sg_gui_fg_name;/* GUI foreground color name */
guicolor_T sg_gui_bg; /* GUI background color handle */
char_u *sg_gui_bg_name;/* GUI background color name */
+ guicolor_T sg_gui_sp; /* GUI special color handle */
+ char_u *sg_gui_sp_name;/* GUI special color name */
GuiFont sg_font; /* GUI font handle */
#ifdef FEAT_XFONTSET
GuiFontset sg_fontset; /* GUI fontset handle */
* following names, separated by commas (but no spaces!).
*/
static char *(hl_name_table[]) =
- {"bold", "standout", "underline", "italic", "reverse", "inverse", "NONE"};
+ {"bold", "standout", "underline", "undercurl",
+ "italic", "reverse", "inverse", "NONE"};
static int hl_attr_table[] =
- {HL_BOLD, HL_STANDOUT, HL_UNDERLINE, HL_ITALIC, HL_INVERSE, HL_INVERSE, 0};
+ {HL_BOLD, HL_STANDOUT, HL_UNDERLINE, HL_UNDERCURL, HL_ITALIC, HL_INVERSE, HL_INVERSE, 0};
static int get_attr_entry __ARGS((garray_T *table, attrentry_T *aep));
static void syn_unadd_group __ARGS((void));
{
syn_id = check_keyword_id(line, (int)current_col,
&endcol, &flags, &next_list, cur_si);
- if (syn_id)
+ if (syn_id != 0)
{
if (push_current_state(KEYWORD_IDX) == OK)
{
}
/*
- * 3. Check for patterns (only if not found a keyword).
+ * 3. Check for patterns (only if no keyword found).
*/
if (syn_id == 0 && syn_buf->b_syn_patterns.ga_len)
{
else if (STRCMP(key, "GUIFG") == 0)
{
#ifdef FEAT_GUI /* in non-GUI guifg colors are simply ignored */
- if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI))
- {
- if (!init)
- HL_TABLE()[idx].sg_set |= SG_GUI;
-
- i = color_name2handle(arg);
- if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !gui.in_use)
+ if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI))
{
- HL_TABLE()[idx].sg_gui_fg = i;
- vim_free(HL_TABLE()[idx].sg_gui_fg_name);
- if (STRCMP(arg, "NONE"))
- HL_TABLE()[idx].sg_gui_fg_name = vim_strsave(arg);
- else
- HL_TABLE()[idx].sg_gui_fg_name = NULL;
+ if (!init)
+ HL_TABLE()[idx].sg_set |= SG_GUI;
+
+ i = color_name2handle(arg);
+ if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !gui.in_use)
+ {
+ HL_TABLE()[idx].sg_gui_fg = i;
+ vim_free(HL_TABLE()[idx].sg_gui_fg_name);
+ if (STRCMP(arg, "NONE"))
+ HL_TABLE()[idx].sg_gui_fg_name = vim_strsave(arg);
+ else
+ HL_TABLE()[idx].sg_gui_fg_name = NULL;
# ifdef FEAT_GUI_X11
- if (is_menu_group)
- gui.menu_fg_pixel = i;
- if (is_scrollbar_group)
- gui.scroll_fg_pixel = i;
+ if (is_menu_group)
+ gui.menu_fg_pixel = i;
+ if (is_scrollbar_group)
+ gui.scroll_fg_pixel = i;
# ifdef FEAT_BEVAL
- if (is_tooltip_group)
- gui.tooltip_fg_pixel = i;
+ if (is_tooltip_group)
+ gui.tooltip_fg_pixel = i;
# endif
- do_colors = TRUE;
+ do_colors = TRUE;
# endif
+ }
}
- }
#endif
}
else if (STRCMP(key, "GUIBG") == 0)
{
#ifdef FEAT_GUI /* in non-GUI guibg colors are simply ignored */
- if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI))
- {
- if (!init)
- HL_TABLE()[idx].sg_set |= SG_GUI;
-
- i = color_name2handle(arg);
- if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !gui.in_use)
+ if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI))
{
- HL_TABLE()[idx].sg_gui_bg = i;
- vim_free(HL_TABLE()[idx].sg_gui_bg_name);
- if (STRCMP(arg, "NONE"))
- HL_TABLE()[idx].sg_gui_bg_name = vim_strsave(arg);
- else
- HL_TABLE()[idx].sg_gui_bg_name = NULL;
+ if (!init)
+ HL_TABLE()[idx].sg_set |= SG_GUI;
+
+ i = color_name2handle(arg);
+ if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !gui.in_use)
+ {
+ HL_TABLE()[idx].sg_gui_bg = i;
+ vim_free(HL_TABLE()[idx].sg_gui_bg_name);
+ if (STRCMP(arg, "NONE") != 0)
+ HL_TABLE()[idx].sg_gui_bg_name = vim_strsave(arg);
+ else
+ HL_TABLE()[idx].sg_gui_bg_name = NULL;
# ifdef FEAT_GUI_X11
- if (is_menu_group)
- gui.menu_bg_pixel = i;
- if (is_scrollbar_group)
- gui.scroll_bg_pixel = i;
+ if (is_menu_group)
+ gui.menu_bg_pixel = i;
+ if (is_scrollbar_group)
+ gui.scroll_bg_pixel = i;
# ifdef FEAT_BEVAL
- if (is_tooltip_group)
- gui.tooltip_bg_pixel = i;
+ if (is_tooltip_group)
+ gui.tooltip_bg_pixel = i;
# endif
- do_colors = TRUE;
+ do_colors = TRUE;
# endif
+ }
+ }
+#endif
+ }
+ else if (STRCMP(key, "GUISP") == 0)
+ {
+#ifdef FEAT_GUI /* in non-GUI guisp colors are simply ignored */
+ if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI))
+ {
+ if (!init)
+ HL_TABLE()[idx].sg_set |= SG_GUI;
+
+ i = color_name2handle(arg);
+ if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !gui.in_use)
+ {
+ HL_TABLE()[idx].sg_gui_sp = i;
+ vim_free(HL_TABLE()[idx].sg_gui_sp_name);
+ if (STRCMP(arg, "NONE") != 0)
+ HL_TABLE()[idx].sg_gui_sp_name = vim_strsave(arg);
+ else
+ HL_TABLE()[idx].sg_gui_sp_name = NULL;
+ }
}
- }
#endif
}
else if (STRCMP(key, "START") == 0 || STRCMP(key, "STOP") == 0)
HL_TABLE()[idx].sg_gui_bg = INVALCOLOR;
vim_free(HL_TABLE()[idx].sg_gui_bg_name);
HL_TABLE()[idx].sg_gui_bg_name = NULL;
+ HL_TABLE()[idx].sg_gui_sp = INVALCOLOR;
+ vim_free(HL_TABLE()[idx].sg_gui_sp_name);
+ HL_TABLE()[idx].sg_gui_sp_name = NULL;
gui_mch_free_font(HL_TABLE()[idx].sg_font);
HL_TABLE()[idx].sg_font = NOFONT;
# ifdef FEAT_XFONTSET
set_normal_colors()
{
if (set_group_colors((char_u *)"Normal",
- &gui.norm_pixel, &gui.back_pixel, FALSE, TRUE,
- FALSE))
+ &gui.norm_pixel, &gui.back_pixel,
+ FALSE, TRUE, FALSE))
{
gui_mch_new_colors();
must_redraw = CLEAR;
}
#ifdef FEAT_GUI_X11
if (set_group_colors((char_u *)"Menu",
- &gui.menu_fg_pixel, &gui.menu_bg_pixel, TRUE, FALSE,
- FALSE))
+ &gui.menu_fg_pixel, &gui.menu_bg_pixel,
+ TRUE, FALSE, FALSE))
{
# ifdef FEAT_MENU
gui_mch_new_menu_colors();
}
#endif
if (set_group_colors((char_u *)"Scrollbar",
- &gui.scroll_fg_pixel, &gui.scroll_bg_pixel, FALSE, FALSE,
- FALSE))
+ &gui.scroll_fg_pixel, &gui.scroll_bg_pixel,
+ FALSE, FALSE, FALSE))
{
gui_new_scrollbar_colors();
must_redraw = CLEAR;
(table == &gui_attr_table
&& (aep->ae_u.gui.fg_color == gap->ae_u.gui.fg_color
&& aep->ae_u.gui.bg_color == gap->ae_u.gui.bg_color
+ && aep->ae_u.gui.sp_color == gap->ae_u.gui.sp_color
&& aep->ae_u.gui.font == gap->ae_u.gui.font
# ifdef FEAT_XFONTSET
&& aep->ae_u.gui.fontset == gap->ae_u.gui.fontset
{
gap->ae_u.gui.fg_color = aep->ae_u.gui.fg_color;
gap->ae_u.gui.bg_color = aep->ae_u.gui.bg_color;
+ gap->ae_u.gui.sp_color = aep->ae_u.gui.sp_color;
gap->ae_u.gui.font = aep->ae_u.gui.font;
# ifdef FEAT_XFONTSET
gap->ae_u.gui.fontset = aep->ae_u.gui.fontset;
char_u *
highlight_color(id, what, modec)
int id;
- char_u *what; /* "fg", "bg", "fg#" or "bg#" */
+ char_u *what; /* "fg", "bg", "sp", "fg#", "bg#" or "sp#" */
int modec; /* 'g' for GUI, 'c' for cterm, 't' for term */
{
static char_u name[20];
int n;
- int fg;
+ int fg = FALSE;
+# ifdef FEAT_GUI
+ int sp = FALSE;
+# endif
if (id <= 0 || id > highlight_ga.ga_len)
return NULL;
if (TOLOWER_ASC(what[0]) == 'f')
fg = TRUE;
- else
- fg = FALSE;
-#ifdef FEAT_GUI
+# ifdef FEAT_GUI
+ else if (TOLOWER_ASC(what[0]) == 's')
+ sp = TRUE;
if (modec == 'g')
{
/* return #RRGGBB form (only possible when GUI is running) */
if (fg)
color = HL_TABLE()[id - 1].sg_gui_fg;
+ else if (sp)
+ color = HL_TABLE()[id - 1].sg_gui_sp;
else
color = HL_TABLE()[id - 1].sg_gui_bg;
if (color == INVALCOLOR)
}
if (fg)
return (HL_TABLE()[id - 1].sg_gui_fg_name);
+ if (sp)
+ return (HL_TABLE()[id - 1].sg_gui_sp_name);
return (HL_TABLE()[id - 1].sg_gui_bg_name);
}
-#endif
+# endif
if (modec == 'c')
{
if (fg)
*/
if (sgp->sg_gui_fg == INVALCOLOR
&& sgp->sg_gui_bg == INVALCOLOR
+ && sgp->sg_gui_sp == INVALCOLOR
&& sgp->sg_font == NOFONT
# ifdef FEAT_XFONTSET
&& sgp->sg_fontset == NOFONTSET
at_en.ae_attr = sgp->sg_gui;
at_en.ae_u.gui.fg_color = sgp->sg_gui_fg;
at_en.ae_u.gui.bg_color = sgp->sg_gui_bg;
+ at_en.ae_u.gui.sp_color = sgp->sg_gui_sp;
at_en.ae_u.gui.font = sgp->sg_font;
# ifdef FEAT_XFONTSET
at_en.ae_u.gui.fontset = sgp->sg_fontset;
#ifdef FEAT_GUI
HL_TABLE()[highlight_ga.ga_len].sg_gui_bg = INVALCOLOR;
HL_TABLE()[highlight_ga.ga_len].sg_gui_fg = INVALCOLOR;
+ HL_TABLE()[highlight_ga.ga_len].sg_gui_sp = INVALCOLOR;
#endif
++highlight_ga.ga_len;
color_name2handle(HL_TABLE()[idx].sg_gui_bg_name);
didit = TRUE;
}
+ if (HL_TABLE()[idx].sg_gui_sp_name != NULL)
+ {
+ HL_TABLE()[idx].sg_gui_sp =
+ color_name2handle(HL_TABLE()[idx].sg_gui_sp_name);
+ didit = TRUE;
+ }
if (didit) /* need to get a new attr number */
set_hl_attr(idx);
}
break;
case 'u': attr |= HL_UNDERLINE;
break;
+ case 'c': attr |= HL_UNDERCURL;
+ break;
case ':': ++p; /* highlight group name */
if (attr || *p == NUL) /* no combinations */
return FAIL;
hlt[hlcnt + i].sg_gui_fg = hlt[id - 1].sg_gui_fg;
if (hlt[id - 1].sg_gui_bg != hlt[id_S - 1].sg_gui_bg)
hlt[hlcnt + i].sg_gui_bg = hlt[id - 1].sg_gui_bg;
+ if (hlt[id - 1].sg_gui_sp != hlt[id_S - 1].sg_gui_sp)
+ hlt[hlcnt + i].sg_gui_sp = hlt[id - 1].sg_gui_sp;
if (hlt[id - 1].sg_font != hlt[id_S - 1].sg_font)
hlt[hlcnt + i].sg_font = hlt[id - 1].sg_font;
# ifdef FEAT_XFONTSET
{(int)KS_SO, IF_EB("\033|16h", ESC_STR "|16h")}, /* HL_STANDOUT */
{(int)KS_UE, IF_EB("\033|8H", ESC_STR "|8H")}, /* HL_UNDERLINE */
{(int)KS_US, IF_EB("\033|8h", ESC_STR "|8h")}, /* HL_UNDERLINE */
+ {(int)KS_UCE, IF_EB("\033|8C", ESC_STR "|8C")}, /* HL_UNDERCURL */
+ {(int)KS_UCS, IF_EB("\033|8c", ESC_STR "|8c")}, /* HL_UNDERCURL */
{(int)KS_CZR, IF_EB("\033|4H", ESC_STR "|4H")}, /* HL_ITALIC */
{(int)KS_CZH, IF_EB("\033|4h", ESC_STR "|4h")}, /* HL_ITALIC */
{(int)KS_VB, IF_EB("\033|f", ESC_STR "|f")},
{(int)KS_CM, IF_EB("\033|%d;%dM", ESC_STR "|%d;%dM")},
# endif
/* there are no key sequences here, the GUI sequences are recognized
- * in check_termcodes() */
+ * in check_termcode() */
#endif
#ifndef NO_BUILTIN_TCAPS
{(int)KS_SO, "[SO]"},
{(int)KS_UE, "[UE]"},
{(int)KS_US, "[US]"},
+ {(int)KS_UCE, "[UCE]"},
+ {(int)KS_UCS, "[UCS]"},
{(int)KS_MS, "[MS]"},
{(int)KS_UT, "[UT]"},
# ifdef TERMINFO
{KS_VS, "vs"}, {KS_ME, "me"}, {KS_MR, "mr"},
{KS_MD, "md"}, {KS_SE, "se"}, {KS_SO, "so"},
{KS_CZH,"ZH"}, {KS_CZR,"ZR"}, {KS_UE, "ue"},
- {KS_US, "us"}, {KS_CM, "cm"}, {KS_SR, "sr"},
+ {KS_US, "us"}, {KS_UCE, "Ce"}, {KS_UCS, "Cs"},
+ {KS_CM, "cm"}, {KS_SR, "sr"},
{KS_CRI,"RI"}, {KS_VB, "vb"}, {KS_KS, "ks"},
{KS_KE, "ke"}, {KS_TI, "ti"}, {KS_TE, "te"},
{KS_BC, "bc"}, {KS_CSB,"Sb"}, {KS_CSF,"Sf"},
#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 11)"
-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 11, compiled "
+#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 "
projects / vim / commitdiff