changeset 53267:bec1d17789a6

(Fcolor_gray_p): Fix omission bug: In case `frame' is nil, consult the selected frame. (Fcolor_supported_p): Likewise.
author Thien-Thi Nguyen <ttn@gnuvola.org>
date Wed, 24 Dec 2003 06:38:55 +0000
parents b3cbb9ec90bb
children 0e78d4abf53a
files src/xfaces.c
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfaces.c	Wed Dec 24 02:58:53 2003 +0000
+++ b/src/xfaces.c	Wed Dec 24 06:38:55 2003 +0000
@@ -1526,8 +1526,11 @@
 {
   struct frame *f;
 
-  CHECK_FRAME (frame);
   CHECK_STRING (color);
+  if (NILP (frame))
+    frame = selected_frame;
+  else
+    CHECK_FRAME (frame);
   f = XFRAME (frame);
   return face_color_gray_p (f, SDATA (color)) ? Qt : Qnil;
 }
@@ -1544,8 +1547,11 @@
 {
   struct frame *f;
 
-  CHECK_FRAME (frame);
   CHECK_STRING (color);
+  if (NILP (frame))
+    frame = selected_frame;
+  else
+    CHECK_FRAME (frame);
   f = XFRAME (frame);
   if (face_color_supported_p (f, SDATA (color), !NILP (background_p)))
     return Qt;
@@ -2252,7 +2258,7 @@
 font_rescale_ratio (name)
      char *name;
 {
-  Lisp_Object tail, elt;  
+  Lisp_Object tail, elt;
 
   for (tail = Vface_font_rescale_alist; CONSP (tail); tail = XCDR (tail))
     {
@@ -2465,7 +2471,7 @@
 
   if (nfonts < 0 && CONSP (lfonts))
     num_fonts = XFASTINT (Flength (lfonts));
-  
+
   /* Make a copy of the font names we got from X, and
      split them into fields.  */
   n = nignored = 0;