(adjust_markers_for_delete): Fix last change.

[gnu-emacs] / src / w32faces.c

diff --git a/src/w32faces.c b/src/w32faces.c
index 3763b600a553d371f8b28da6794b392a950ac8d8..1a13c28f11a62e6fb29d01fa9faeaa16420f837c 100644 (file)
--- a/src/w32faces.c
+++ b/src/w32faces.c
@@ -1,5 +1,5 @@
 /* "Face" primitives on the Microsoft W32 API.
-   Copyright (C) 1993, 1994, 1995 Free Software Foundation.
+   Copyright (C) 1993, 1994, 1995, 1999 Free Software Foundation.
 
 This file is part of GNU Emacs.
 
@@ -20,10 +20,10 @@ Boston, MA 02111-1307, USA.  */
 
 /* Ported xfaces.c for w32 - Kevin Gallo */
 
+#include <config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <config.h>
 #include "lisp.h"
 
 #include "w32term.h"
@@ -134,9 +134,11 @@ static int region_face;
    does not specify that display aspect.  */
 #define FACE_DEFAULT (~0)
 
-Lisp_Object Qface, Qmouse_face;
+Lisp_Object Qface;
 Lisp_Object Qpixmap_spec_p;
 
+extern Lisp_Object Qmouse_face;  /* In textprop.c.  */
+
 int face_name_id_number ( /* FRAME_PTR, Lisp_Object name */ );
 
 struct face *intern_face ( /* FRAME_PTR, struct face * */ );
@@ -300,16 +302,16 @@ DEFUN ("pixmap-spec-p", Fpixmap_spec_p, Spixmap_spec_p, 1, 1, 0,
 
   return ((STRINGP (object)
           || (CONSP (object)
-              && CONSP (XCONS (object)->cdr)
-              && CONSP (XCONS (XCONS (object)->cdr)->cdr)
-              && NILP (XCONS (XCONS (XCONS (object)->cdr)->cdr)->cdr)
-              && (width = XCONS (object)->car, INTEGERP (width))
-              && (height = XCONS (XCONS (object)->cdr)->car, INTEGERP (height))
-              && STRINGP (XCONS (XCONS (XCONS (object)->cdr)->cdr)->car)
+              && CONSP (XCDR (object))
+              && CONSP (XCDR (XCDR (object)))
+              && NILP (XCDR (XCDR (XCDR (object))))
+              && (width = XCAR (object), INTEGERP (width))
+              && (height = XCAR (XCDR (object)), INTEGERP (height))
+              && STRINGP (XCAR (XCDR (XCDR (object))))
               && XINT (width) > 0
               && XINT (height) > 0
               /* The string must have enough bits for width * height.  */
-              && ((XSTRING (XCONS (XCONS (XCONS (object)->cdr)->cdr)->car)->size
+              && ((XSTRING (XCAR (XCDR (XCDR (object))))->size
                    * (BITS_PER_INT / sizeof (int)))
                   >= XFASTINT (width) * XFASTINT (height))))
          ? Qt : Qnil);
@@ -826,7 +828,7 @@ merge_face_list (f, face, prop)
   int j;
 
   if (CONSP (prop)
-      && ! STRINGP (XCONS (prop)->cdr))
+      && ! STRINGP (XCDR (prop)))
     {
       /* We have a list of faces, merge them in reverse order.  */
 
@@ -853,10 +855,10 @@ merge_face_list (f, face, prop)
     {
       if (CONSP (faces[j]))
        {
-         if (EQ (XCONS (faces[j])->car, Qbackground_color))
-           face->background = load_color (f, XCONS (faces[j])->cdr);
-         if (EQ (XCONS (faces[j])->car, Qforeground_color))
-           face->foreground = load_color (f, XCONS (faces[j])->cdr);
+         if (EQ (XCAR (faces[j]), Qbackground_color))
+           face->background = load_color (f, XCDR (faces[j]));
+         if (EQ (XCAR (faces[j]), Qforeground_color))
+           face->foreground = load_color (f, XCDR (faces[j]));
        }
       else
        {