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

[Ken Raeburn]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.260 emacs/src/xfaces.c:1.261
*** emacs/src/xfaces.c:1.260    Tue Jul 16 15:49:19 2002
--- emacs/src/xfaces.c  Fri Jul 19 10:27:28 2002
***************
*** 484,490 ****
  static void map_tty_color P_ ((struct frame *, struct face *,
                               enum lface_attribute_index, int *));
  static Lisp_Object resolve_face_name P_ ((Lisp_Object));
! static int may_use_scalable_font_p P_ ((char *));
  static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object));
  static int better_font_p P_ ((int *, struct font_name *, struct font_name *,
                              int, int));
--- 484,490 ----
  static void map_tty_color P_ ((struct frame *, struct face *,
                               enum lface_attribute_index, int *));
  static Lisp_Object resolve_face_name P_ ((Lisp_Object));
! static int may_use_scalable_font_p P_ ((const char *));
  static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object));
  static int better_font_p P_ ((int *, struct font_name *, struct font_name *,
                              int, int));
***************
*** 2476,2482 ****
    for (tem = lfonts; CONSP (tem) && n < nfonts; tem = XCDR (tem))
      {
        Lisp_Object elt, tail;
!       char *name = SDATA (XCAR (tem));
  
        /* Ignore fonts matching a pattern from face-ignored-fonts.  */
        for (tail = Vface_ignored_fonts; CONSP (tail); tail = XCDR (tail))
--- 2476,2482 ----
    for (tem = lfonts; CONSP (tem) && n < nfonts; tem = XCDR (tem))
      {
        Lisp_Object elt, tail;
!       const char *name = SDATA (XCAR (tem));
  
        /* Ignore fonts matching a pattern from face-ignored-fonts.  */
        for (tail = Vface_ignored_fonts; CONSP (tail); tail = XCDR (tail))
***************
*** 4528,4534 ****
        char line[512];
        Lisp_Object lface = lface_from_face_name (f, Qmenu, 1);
        struct face *face = FACE_FROM_ID (f, MENU_FACE_ID);
!       char *myname = SDATA (Vx_resource_name);
        int changed_p = 0;
  #ifdef USE_MOTIF
        const char *popup_path = "popup_menu";
--- 4528,4534 ----
        char line[512];
        Lisp_Object lface = lface_from_face_name (f, Qmenu, 1);
        struct face *face = FACE_FROM_ID (f, MENU_FACE_ID);
!       const char *myname = SDATA (Vx_resource_name);
        int changed_p = 0;
  #ifdef USE_MOTIF
        const char *popup_path = "popup_menu";
***************
*** 4939,4945 ****
  hash_string_case_insensitive (string)
       Lisp_Object string;
  {
!   unsigned char *s;
    unsigned hash = 0;
    xassert (STRINGP (string));
    for (s = SDATA (string); *s; ++s)
--- 4939,4945 ----
  hash_string_case_insensitive (string)
       Lisp_Object string;
  {
!   const unsigned char *s;
    unsigned hash = 0;
    xassert (STRINGP (string));
    for (s = SDATA (string); *s; ++s)
***************
*** 6126,6132 ****
  
  static int
  may_use_scalable_font_p (font)
!      char *font;
  {
    if (EQ (Vscalable_fonts_allowed, Qt))
      return 1;
--- 6126,6132 ----
  
  static int
  may_use_scalable_font_p (font)
!      const char *font;
  {
    if (EQ (Vscalable_fonts_allowed, Qt))
      return 1;