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

[Dave Love]

Index: emacs/src/fontset.c
diff -c emacs/src/fontset.c:1.68 emacs/src/fontset.c:1.69
*** emacs/src/fontset.c:1.68    Sun Jun 16 19:08:56 2002
--- emacs/src/fontset.c Sun Jul 14 20:00:36 2002
***************
*** 370,376 ****
       int force;
  {
    Lisp_Object family, registry;
!   char *p = XSTRING (fontname)->data;
    char *sep[15];
    int i = 0;
  
--- 370,376 ----
       int force;
  {
    Lisp_Object family, registry;
!   char *p = SDATA (fontname);
    char *sep[15];
    int i = 0;
  
***************
*** 557,563 ****
       font name.  */
    elt = XCDR (elt);
    xassert (STRINGP (elt));
!   fontp = FS_LOAD_FONT (f, c, XSTRING (elt)->data, -1);
    if (!fontp)
      return Qnil;
  
--- 557,563 ----
       font name.  */
    elt = XCDR (elt);
    xassert (STRINGP (elt));
!   fontp = FS_LOAD_FONT (f, c, SDATA (elt), -1);
    if (!fontp)
      return Qnil;
  
***************
*** 616,622 ****
        if (!fontname && charset == CHARSET_ASCII)
        {
          elt = FONTSET_ASCII (fontset);
!         fontname = XSTRING (XCDR (elt))->data;
        }
      }
  
--- 616,622 ----
        if (!fontname && charset == CHARSET_ASCII)
        {
          elt = FONTSET_ASCII (fontset);
!         fontname = SDATA (XCDR (elt));
        }
      }
  
***************
*** 705,711 ****
     the corresponding regular expression.  */
  static Lisp_Object Vcached_fontset_data;
  
! #define CACHED_FONTSET_NAME (XSTRING (XCAR (Vcached_fontset_data))->data)
  #define CACHED_FONTSET_REGEX (XCDR (Vcached_fontset_data))
  
  /* If fontset name PATTERN contains any wild card, return regular
--- 705,711 ----
     the corresponding regular expression.  */
  static Lisp_Object Vcached_fontset_data;
  
! #define CACHED_FONTSET_NAME (SDATA (XCAR (Vcached_fontset_data)))
  #define CACHED_FONTSET_REGEX (XCDR (Vcached_fontset_data))
  
  /* If fontset name PATTERN contains any wild card, return regular
***************
*** 715,735 ****
  fontset_pattern_regexp (pattern)
       Lisp_Object pattern;
  {
!   if (!index (XSTRING (pattern)->data, '*')
!       && !index (XSTRING (pattern)->data, '?'))
      /* PATTERN does not contain any wild cards.  */
      return Qnil;
  
    if (!CONSP (Vcached_fontset_data)
!       || strcmp (XSTRING (pattern)->data, CACHED_FONTSET_NAME))
      {
        /* We must at first update the cached data.  */
!       char *regex = (char *) alloca (XSTRING (pattern)->size * 2 + 3);
        char *p0, *p1 = regex;
  
        /* Convert "*" to ".*", "?" to ".".  */
        *p1++ = '^';
!       for (p0 = (char *) XSTRING (pattern)->data; *p0; p0++)
        {
          if (*p0 == '*')
            {
--- 715,735 ----
  fontset_pattern_regexp (pattern)
       Lisp_Object pattern;
  {
!   if (!index (SDATA (pattern), '*')
!       && !index (SDATA (pattern), '?'))
      /* PATTERN does not contain any wild cards.  */
      return Qnil;
  
    if (!CONSP (Vcached_fontset_data)
!       || strcmp (SDATA (pattern), CACHED_FONTSET_NAME))
      {
        /* We must at first update the cached data.  */
!       char *regex = (char *) alloca (SCHARS (pattern) * 2 + 3);
        char *p0, *p1 = regex;
  
        /* Convert "*" to ".*", "?" to ".".  */
        *p1++ = '^';
!       for (p0 = (char *) SDATA (pattern); *p0; p0++)
        {
          if (*p0 == '*')
            {
***************
*** 744,750 ****
        *p1++ = '$';
        *p1++ = 0;
  
!       Vcached_fontset_data = Fcons (build_string (XSTRING (pattern)->data),
                                    build_string (regex));
      }
  
--- 744,750 ----
        *p1++ = '$';
        *p1++ = 0;
  
!       Vcached_fontset_data = Fcons (build_string (SDATA (pattern)),
                                    build_string (regex));
      }
  
***************
*** 789,798 ****
          || !BASE_FONTSET_P (fontset))
        continue;
  
!       this_name = XSTRING (FONTSET_NAME (fontset))->data;
        if (regexpp
          ? fast_c_string_match_ignore_case (name, this_name) >= 0
!         : !strcmp (XSTRING (name)->data, this_name))
        return i;
      }
    return -1;
--- 789,798 ----
          || !BASE_FONTSET_P (fontset))
        continue;
  
!       this_name = SDATA (FONTSET_NAME (fontset));
        if (regexpp
          ? fast_c_string_match_ignore_case (name, this_name) >= 0
!         : !strcmp (SDATA (name), this_name))
        return i;
      }
    return -1;
***************
*** 815,821 ****
  
    CHECK_STRING (pattern);
  
!   if (XSTRING (pattern)->size == 0)
      return Qnil;
  
    id = fs_query_fontset (pattern, !NILP (regexpp));
--- 815,821 ----
  
    CHECK_STRING (pattern);
  
!   if (SCHARS (pattern) == 0)
      return Qnil;
  
    id = fs_query_fontset (pattern, !NILP (regexpp));
***************
*** 854,864 ****
          || !BASE_FONTSET_P (fontset)
          || !EQ (frame, FONTSET_FRAME (fontset)))
        continue;
!       name = XSTRING (FONTSET_NAME (fontset))->data;
  
        if (!NILP (regexp)
          ? (fast_c_string_match_ignore_case (regexp, name) < 0)
!         : strcmp (XSTRING (pattern)->data, name))
        continue;
  
        if (size)
--- 854,864 ----
          || !BASE_FONTSET_P (fontset)
          || !EQ (frame, FONTSET_FRAME (fontset)))
        continue;
!       name = SDATA (FONTSET_NAME (fontset));
  
        if (!NILP (regexp)
          ? (fast_c_string_match_ignore_case (regexp, name) < 0)
!         : strcmp (SDATA (pattern), name))
        continue;
  
        if (size)
***************
*** 892,898 ****
    tem = Fquery_fontset (name, Qnil);
    if (!NILP (tem))
      error ("Fontset `%s' matches the existing fontset `%s'",
!          XSTRING (name)->data, XSTRING (tem)->data);
  
    /* Check the validity of FONTLIST while creating a template for
       fontset elements.  */
--- 892,898 ----
    tem = Fquery_fontset (name, Qnil);
    if (!NILP (tem))
      error ("Fontset `%s' matches the existing fontset `%s'",
!          SDATA (name), SDATA (tem));
  
    /* Check the validity of FONTLIST while creating a template for
       fontset elements.  */
***************
*** 969,975 ****
    CHECK_STRING (name);
    id = fs_query_fontset (name, 0);
    if (id < 0)
!     error ("Fontset `%s' does not exist", XSTRING (name)->data);
    return FONTSET_FROM_ID (id);
  }
  
--- 969,975 ----
    CHECK_STRING (name);
    id = fs_query_fontset (name, 0);
    if (id < 0)
!     error ("Fontset `%s' does not exist", SDATA (name));
    return FONTSET_FROM_ID (id);
  }
  
***************
*** 1120,1126 ****
    if (!query_font_func)
      error ("Font query function is not supported");
  
!   fontp = (*query_font_func) (f, XSTRING (name)->data);
    if (!fontp)
      return Qnil;
  
--- 1120,1126 ----
    if (!query_font_func)
      error ("Font query function is not supported");
  
!   fontp = (*query_font_func) (f, SDATA (name));
    if (!fontp)
      return Qnil;
  
***************
*** 1338,1344 ****
    if (CONSP (elt))
      {
        elt = XCAR (elt);
!       fontp = (*query_font_func) (f, XSTRING (elt)->data);
      }
    val = Fmake_vector (make_number (3), val);
    AREF (val, 0) = fontp ? make_number (fontp->size) : make_number (0);
--- 1338,1344 ----
    if (CONSP (elt))
      {
        elt = XCAR (elt);
!       fontp = (*query_font_func) (f, SDATA (elt));
      }
    val = Fmake_vector (make_number (3), val);
    AREF (val, 0) = fontp ? make_number (fontp->size) : make_number (0);