diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-03-10 13:43:49 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-03-10 13:43:49 +0100 |
| commit | 12682fda7aa95033cc62c93f94b07b57bb49e1c9 (patch) | |
| tree | 6b5a3eb43b8c0a7753bb52d9dce01624ae61a991 /src | |
| parent | 66ca320d9ee4953cc71991a4ddec17f11f3407ac (diff) | |
| download | vim-git-12682fda7aa95033cc62c93f94b07b57bb49e1c9.tar.gz | |
updated for version 7.2.389v7.2.389
Problem: synIDattr() cannot return the font.
Solution: Support the "font" argument. (Christian Brabandt)
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/syntax.c | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 19 insertions, 5 deletions
diff --git a/src/eval.c b/src/eval.c index 87333c2ba..f9babb3fc 100644 --- a/src/eval.c +++ b/src/eval.c @@ -16627,7 +16627,7 @@ f_synIDattr(argvars, rettv) p = highlight_has_attr(id, HL_BOLD, modec); break; - case 'f': /* fg[#] */ + case 'f': /* fg[#] or font */ p = highlight_color(id, what, modec); break; diff --git a/src/syntax.c b/src/syntax.c index 8d976ea40..3f502b70d 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -8326,7 +8326,7 @@ highlight_has_attr(id, flag, modec) char_u * highlight_color(id, what, modec) int id; - char_u *what; /* "fg", "bg", "sp", "fg#", "bg#" or "sp#" */ + char_u *what; /* "font", "fg", "bg", "sp", "fg#", "bg#" or "sp#" */ int modec; /* 'g' for GUI, 'c' for cterm, 't' for term */ { static char_u name[20]; @@ -8334,20 +8334,30 @@ highlight_color(id, what, modec) int fg = FALSE; # ifdef FEAT_GUI int sp = FALSE; + int font = FALSE; # endif if (id <= 0 || id > highlight_ga.ga_len) return NULL; - if (TOLOWER_ASC(what[0]) == 'f') + if (TOLOWER_ASC(what[0]) == 'f' && TOLOWER_ASC(what[1]) == 'g') fg = TRUE; # ifdef FEAT_GUI - else if (TOLOWER_ASC(what[0]) == 's') + else if (TOLOWER_ASC(what[0]) == 'f' && TOLOWER_ASC(what[1]) == 'o' + && TOLOWER_ASC(what[2]) == 'n' && TOLOWER_ASC(what[3]) == 't') + font = TRUE; + else if (TOLOWER_ASC(what[0]) == 's' && TOLOWER_ASC(what[1]) == 'p') sp = TRUE; + else if (!(TOLOWER_ASC(what[0]) == 'b' && TOLOWER_ASC(what[1]) == 'g')) + return NULL; if (modec == 'g') { + /* return font name */ + if (font) + return HL_TABLE()[id - 1].sg_font_name; + /* return #RRGGBB form (only possible when GUI is running) */ - if (gui.in_use && what[1] && what[2] == '#') + if (gui.in_use && what[2] == '#') { guicolor_T color; long_u rgb; @@ -8374,6 +8384,8 @@ highlight_color(id, what, modec) return (HL_TABLE()[id - 1].sg_gui_sp_name); return (HL_TABLE()[id - 1].sg_gui_bg_name); } + if (font || sp) + return NULL; # endif if (modec == 'c') { diff --git a/src/version.c b/src/version.c index c9adec1f2..109532e7c 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 389, +/**/ 388, /**/ 387, |