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

[Ken Raeburn]

Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.11 emacs/src/macterm.c:1.12
*** emacs/src/macterm.c:1.11    Wed Jul  3 22:43:48 2002
--- emacs/src/macterm.c Sun Jul 14 20:00:36 2002
***************
*** 7005,7013 ****
  
        if (glyph < end
          && STRINGP (glyph->object)
!         && XSTRING (glyph->object)->intervals
          && glyph->charpos >= 0
!         && glyph->charpos < XSTRING (glyph->object)->size)
        {
          /* If we're on a string with `help-echo' text property,
             arrange for the help to be displayed.  This is done by
--- 7005,7013 ----
  
        if (glyph < end
          && STRINGP (glyph->object)
!         && STRING_INTERVALS (glyph->object)
          && glyph->charpos >= 0
!         && glyph->charpos < SCHARS (glyph->object))
        {
          /* If we're on a string with `help-echo' text property,
             arrange for the help to be displayed.  This is done by
***************
*** 7328,7334 ****
              if (NILP (b))
                b = make_number (0);
              if (NILP (e))
!               e = make_number (XSTRING (object)->size - 1);
              fast_find_string_pos (w, XINT (b), object,
                                    &dpyinfo->mouse_face_beg_col,
                                    &dpyinfo->mouse_face_beg_row,
--- 7328,7334 ----
              if (NILP (b))
                b = make_number (0);
              if (NILP (e))
!               e = make_number (SCHARS (object) - 1);
              fast_find_string_pos (w, XINT (b), object,
                                    &dpyinfo->mouse_face_beg_col,
                                    &dpyinfo->mouse_face_beg_row,
***************
*** 7426,7432 ****
            /* Try text properties.  */
            if (STRINGP (object)
                && charpos >= 0
!               && charpos < XSTRING (object)->size)
              {
                help = Fget_text_property (make_number (charpos),
                                           Qhelp_echo, object);
--- 7426,7432 ----
            /* Try text properties.  */
            if (STRINGP (object)
                && charpos >= 0
!               && charpos < SCHARS (object))
              {
                help = Fget_text_property (make_number (charpos),
                                           Qhelp_echo, object);
***************
*** 9469,9475 ****
    if (NILP (icon))
      hicon = LoadIcon (hinst, EMACS_CLASS);
    else if (STRINGP (icon))
!     hicon = LoadImage (NULL, (LPCTSTR) XSTRING (icon)->data, IMAGE_ICON, 0, 0,
                       LR_DEFAULTSIZE | LR_LOADFROMFILE);
    else if (SYMBOLP (icon))
      {
--- 9469,9475 ----
    if (NILP (icon))
      hicon = LoadIcon (hinst, EMACS_CLASS);
    else if (STRINGP (icon))
!     hicon = LoadImage (NULL, (LPCTSTR) SDATA (icon), IMAGE_ICON, 0, 0,
                       LR_DEFAULTSIZE | LR_LOADFROMFILE);
    else if (SYMBOLP (icon))
      {
***************
*** 9606,9612 ****
         to do.  */
      return fontset_name (fontset);
  
!   result = x_new_font (f, (XSTRING (fontset_ascii (fontset))->data));
  
    if (!STRINGP (result))
      /* Can't load ASCII font.  */
--- 9606,9612 ----
         to do.  */
      return fontset_name (fontset);
  
!   result = x_new_font (f, (SDATA (fontset_ascii (fontset))));
  
    if (!STRINGP (result))
      /* Can't load ASCII font.  */
***************
*** 10893,10899 ****
        }
      }
  
!   ptnstr = XSTRING (pattern)->data;
  
    GCPRO2 (pattern, newlist);
  
--- 10893,10899 ----
        }
      }
  
!   ptnstr = SDATA (pattern);
  
    GCPRO2 (pattern, newlist);
  
***************
*** 11243,11251 ****
        for (tail = font_names; CONSP (tail); tail = XCDR (tail))
          if (dpyinfo->font_table[i].name
              && (!strcmp (dpyinfo->font_table[i].name,
!                          XSTRING (XCAR (tail))->data)
                  || !strcmp (dpyinfo->font_table[i].full_name,
!                             XSTRING (XCAR (tail))->data)))
            return (dpyinfo->font_table + i);
      }
  
--- 11243,11251 ----
        for (tail = font_names; CONSP (tail); tail = XCDR (tail))
          if (dpyinfo->font_table[i].name
              && (!strcmp (dpyinfo->font_table[i].name,
!                          SDATA (XCAR (tail)))
                  || !strcmp (dpyinfo->font_table[i].full_name,
!                             SDATA (XCAR (tail)))))
            return (dpyinfo->font_table + i);
      }
  
***************
*** 11263,11269 ****
         a bug of not finding a font even if the font surely exists and
         is loadable by XLoadQueryFont.  */
      if (size > 0 && !NILP (font_names))
!       fontname = (char *) XSTRING (XCAR (font_names))->data;
  
      font = (MacFontStruct *) XLoadQueryFont (FRAME_MAC_DISPLAY (f), fontname);
      if (!font)
--- 11263,11269 ----
         a bug of not finding a font even if the font surely exists and
         is loadable by XLoadQueryFont.  */
      if (size > 0 && !NILP (font_names))
!       fontname = (char *) SDATA (XCAR (font_names));
  
      font = (MacFontStruct *) XLoadQueryFont (FRAME_MAC_DISPLAY (f), fontname);
      if (!font)
***************
*** 11457,11463 ****
       char *name1, *name2;
  {
    int seen_colon = 0;
!   unsigned char *system_name = XSTRING (Vsystem_name)->data;
    int system_name_length = strlen (system_name);
    int length_until_period = 0;
  
--- 11457,11463 ----
       char *name1, *name2;
  {
    int seen_colon = 0;
!   unsigned char *system_name = SDATA (Vsystem_name);
    int system_name_length = strlen (system_name);
    int length_until_period = 0;
  
***************
*** 12968,12974 ****
       char *name1, *name2;
  {
    int seen_colon = 0;
!   unsigned char *system_name = XSTRING (Vsystem_name)->data;
    int system_name_length = strlen (system_name);
    int length_until_period = 0;
  
--- 12968,12974 ----
       char *name1, *name2;
  {
    int seen_colon = 0;
!   unsigned char *system_name = SDATA (Vsystem_name);
    int system_name_length = strlen (system_name);
    int length_until_period = 0;
  
***************
*** 13026,13036 ****
    
  #if 0
    dpyinfo->mac_id_name
!     = (char *) xmalloc (XSTRING (Vinvocation_name)->size
!                       + XSTRING (Vsystem_name)->size
                        + 2);
    sprintf (dpyinfo->mac_id_name, "address@hidden",
!          XSTRING (Vinvocation_name)->data, XSTRING (Vsystem_name)->data);
  #else
    dpyinfo->mac_id_name = (char *) xmalloc (strlen ("Mac Display") + 1);
    strcpy (dpyinfo->mac_id_name, "Mac Display");
--- 13026,13036 ----
    
  #if 0
    dpyinfo->mac_id_name
!     = (char *) xmalloc (SCHARS (Vinvocation_name)
!                       + SCHARS (Vsystem_name)
                        + 2);
    sprintf (dpyinfo->mac_id_name, "address@hidden",
!          SDATA (Vinvocation_name), SDATA (Vsystem_name));
  #else
    dpyinfo->mac_id_name = (char *) xmalloc (strlen ("Mac Display") + 1);
    strcpy (dpyinfo->mac_id_name, "Mac Display");