[Emacs-diffs] Changes to emacs/src/xfaces.c [emacs-unicode-2]

[Dave Love]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.281.2.1 emacs/src/xfaces.c:1.281.2.2
*** emacs/src/xfaces.c:1.281.2.1        Mon Sep  8 08:48:16 2003
--- emacs/src/xfaces.c  Mon Sep 29 14:15:16 2003
***************
*** 1376,1382 ****
    color_def->green = 0;
  
    if (*color_name)
!     status = tty_lookup_color (f, build_string (color_name), color_def, 0);
  
    if (color_def->pixel == FACE_TTY_DEFAULT_COLOR && *color_name)
      {
--- 1376,1382 ----
    color_def->green = 0;
  
    if (*color_name)
!     status = tty_lookup_color (f, build_string (color_name), color_def, NULL);
  
    if (color_def->pixel == FACE_TTY_DEFAULT_COLOR && *color_name)
      {
***************
*** 2108,2114 ****
  static INLINE int
  face_numeric_value (table, dim, symbol)
       struct table_entry *table;
!      int dim;
       Lisp_Object symbol;
  {
    struct table_entry *p = face_value (table, dim, symbol);
--- 2108,2114 ----
  static INLINE int
  face_numeric_value (table, dim, symbol)
       struct table_entry *table;
!      size_t dim;
       Lisp_Object symbol;
  {
    struct table_entry *p = face_value (table, dim, symbol);
***************
*** 4953,4969 ****
       Lisp_Object face1, face2, frame;
  {
    int equal_p;
-   struct frame *f;
    Lisp_Object lface1, lface2;
- 
-   if (EQ (frame, Qt))
-     f = NULL;
-   else
-     /* Don't use check_x_frame here because this function is called
-        before X frames exist.  At that time, if FRAME is nil,
-        selected_frame will be used which is the frame dumped with
-        Emacs.  That frame is not an X frame.  */
-     f = frame_or_selected_frame (frame, 2);
  
    lface1 = lface_from_face_name (NULL, face1, 1);
    lface2 = lface_from_face_name (NULL, face2, 1);
--- 4953,4959 ----