comparison src/xfaces.c @ 26601:e23e3120d84f

(set_lface_from_font_name): Fix previous change. (recompute_basic_faces): Change assert to abort.

26600:a31098c759d5

recompute_basic_faces (f)
     struct frame *f;
{
  if (FRAME_FACE_CACHE (f))
    {
      int realized_p;
      clear_face_cache (0);
      realized_p = realize_basic_faces (f);
      xassert (realized_p);
    }
}


/* Clear the face caches of all frames.  CLEAR_FONTS_P non-zero means

	free_font_name_p = have_font_p = 1;
    }
  else
    {
      font.name = STRDUPA (font_name);
      if (!split_font_name (f, &font, 1))
	{
	  /* The font name may be something like `6x13'.  Make
	     sure we use the full name.  */
	  struct font_info *font_info;

	  BLOCK_INPUT;
	  font_info = fs_load_font (f, FRAME_X_FONT_TABLE (f),
				    CHARSET_ASCII, font_name, -1);
	  UNBLOCK_INPUT;

	  if (font_info)
	    {
	      font.name = STRDUPA (font_info->full_name);
	      split_font_name (f, &font, 1);
	      have_font_p = 1;
	    }
	}
    }

  /* If FONT_NAME is completely bogus try to use something reasonable
     if this function must succeed.  Otherwise, give up.  */

26601:e23e3120d84f

recompute_basic_faces (f)
     struct frame *f;
{
  if (FRAME_FACE_CACHE (f))
    {
      clear_face_cache (0);
      if (!realize_basic_faces (f))
	abort ();
    }
}


/* Clear the face caches of all frames.  CLEAR_FONTS_P non-zero means

	free_font_name_p = have_font_p = 1;
    }
  else
    {
      font.name = STRDUPA (font_name);
      if (split_font_name (f, &font, 1))
	have_font_p = 1;
      else
	{
	  /* The font name may be something like `6x13'.  Make
	     sure we use the full name.  */
	  struct font_info *font_info;

	  BLOCK_INPUT;
	  font_info = fs_load_font (f, FRAME_X_FONT_TABLE (f),
				    CHARSET_ASCII, font_name, -1);
	  if (font_info)
	    {
	      font.name = STRDUPA (font_info->full_name);
	      split_font_name (f, &font, 1);
	      have_font_p = 1;
	    }
	  
	  UNBLOCK_INPUT;
	}
    }

  /* If FONT_NAME is completely bogus try to use something reasonable
     if this function must succeed.  Otherwise, give up.  */