Mercurial > emacs

comparison src/xfaces.c @ 91204:53108e6cea98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
author Miles Bader <miles@gnu.org>
date Thu, 06 Dec 2007 09:51:45 +0000
parents 609500aa30a8 51288a744d1c
children 606f2d163a64
comparison
equal deleted inserted replaced
91203:db40129142b2 91204:53108e6cea98
1471 1471
1472 if (idx == FACE_TTY_DEFAULT_FG_COLOR) 1472 if (idx == FACE_TTY_DEFAULT_FG_COLOR)
1473 return build_string (unspecified_fg); 1473 return build_string (unspecified_fg);
1474 if (idx == FACE_TTY_DEFAULT_BG_COLOR) 1474 if (idx == FACE_TTY_DEFAULT_BG_COLOR)
1475 return build_string (unspecified_bg); 1475 return build_string (unspecified_bg);
1476
1477 #ifdef WINDOWSNT
1478 return vga_stdcolor_name (idx);
1479 #endif
1480 1476
1481 return Qunspecified; 1477 return Qunspecified;
1482 } 1478 }
1483 1479
1484 1480
7946 7942
7947 if (pixel == default_pixel && STRINGP (color)) 7943 if (pixel == default_pixel && STRINGP (color))
7948 { 7944 {
7949 pixel = load_color (f, face, color, idx); 7945 pixel = load_color (f, face, color, idx);
7950 7946
7951 #if defined (MSDOS) || defined (WINDOWSNT) 7947 #ifdef MSDOS
7952 /* If the foreground of the default face is the default color, 7948 /* If the foreground of the default face is the default color,
7953 use the foreground color defined by the frame. */ 7949 use the foreground color defined by the frame. */
7954 #ifdef MSDOS
7955 if (FRAME_MSDOS_P (f)) 7950 if (FRAME_MSDOS_P (f))
7956 { 7951 {
7957 #endif /* MSDOS */
7958 if (pixel == default_pixel 7952 if (pixel == default_pixel
7959 || pixel == FACE_TTY_DEFAULT_COLOR) 7953 || pixel == FACE_TTY_DEFAULT_COLOR)
7960 { 7954 {
7961 if (foreground_p) 7955 if (foreground_p)
7962 pixel = FRAME_FOREGROUND_PIXEL (f); 7956 pixel = FRAME_FOREGROUND_PIXEL (f);
7972 else 7966 else
7973 pixel = FRAME_FOREGROUND_PIXEL (f); 7967 pixel = FRAME_FOREGROUND_PIXEL (f);
7974 face->lface[idx] = tty_color_name (f, pixel); 7968 face->lface[idx] = tty_color_name (f, pixel);
7975 *defaulted = 1; 7969 *defaulted = 1;
7976 } 7970 }
7977 #ifdef MSDOS 7971 }
7978 } 7972 #endif /* MSDOS */
7979 #endif
7980 #endif /* MSDOS or WINDOWSNT */
7981 } 7973 }
7982 7974
7983 if (foreground_p) 7975 if (foreground_p)
7984 face->foreground = pixel; 7976 face->foreground = pixel;
7985 else 7977 else