procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(w32_face_attributes): Don't use color indexes that are out of range.

Browse source 
Only reverse the default colors.
This commit is contained in:
Jason Rumney 2007-11-30 17:15:46 +00:00
parent 182aef95b4
commit f442d34883
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/w32console.c
View file

@ -506,23 +506,25 @@ w32_face_attributes (f, face_id)
char_attr = char_attr_normal;
if (face->foreground != FACE_TTY_DEFAULT_FG_COLOR
&& face->foreground != FACE_TTY_DEFAULT_COLOR)
char_attr = (char_attr & 0xfff0) + (face->foreground % 16);
if (face->background != FACE_TTY_DEFAULT_BG_COLOR
&& face->background != FACE_TTY_DEFAULT_COLOR)
char_attr = (char_attr & 0xff0f) + ((face->background % 16) << 4);
/* Before the terminal is properly initialized, all colors map to 0.
If we get a face like this, use the normal terminal attributes. */
if (NILP (Vtty_defined_color_alist))
char_attr = char_attr_normal;
/* Reverse the default color if requested. If background and
foreground are specified, then they have been reversed already. */
if (face->tty_reverse_p)
char_attr = (char_attr & 0xff00) + ((char_attr & 0x000f) << 4)
+ ((char_attr & 0x00f0) >> 4);
/* Before the terminal is properly initialized, all colors map to 0.
Don't try to resolve them. */
if (NILP (Vtty_defined_color_alist))
return char_attr;
if (face->foreground >= 0
&& face->foreground < 16)
char_attr = (char_attr & 0xfff0) + face->foreground;
if (face->background >= 0
&& face->background < 16)
char_attr = (char_attr & 0xff0f) + (face->background << 4);
return char_attr;
}