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

[Ken Raeburn]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.162 emacs/src/w32term.c:1.163
*** emacs/src/w32term.c:1.162   Thu Jun 13 10:58:38 2002
--- emacs/src/w32term.c Sun Jul 14 20:00:37 2002
***************
*** 6508,6516 ****
  
        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
--- 6508,6516 ----
  
        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
***************
*** 6829,6835 ****
              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,
--- 6829,6835 ----
              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,
***************
*** 6927,6933 ****
            /* Try text properties.  */
            if (STRINGP (object)
                && charpos >= 0
!               && charpos < XSTRING (object)->size)
              {
                help = Fget_text_property (make_number (charpos),
                                           Qhelp_echo, object);
--- 6927,6933 ----
            /* Try text properties.  */
            if (STRINGP (object)
                && charpos >= 0
!               && charpos < SCHARS (object))
              {
                help = Fget_text_property (make_number (charpos),
                                           Qhelp_echo, object);
***************
*** 8619,8625 ****
                  /* We may get paint messages even though the client
                     area is clipped - these are not expose events. */
                  DebPrint (("clipped frame %p (%s) got WM_PAINT - ignored\n", 
f,
!                            XSTRING (f->name)->data));
                }
              else if (f->async_visible != 1)
                {
--- 8619,8625 ----
                  /* We may get paint messages even though the client
                     area is clipped - these are not expose events. */
                  DebPrint (("clipped frame %p (%s) got WM_PAINT - ignored\n", 
f,
!                            SDATA (f->name)));
                }
              else if (f->async_visible != 1)
                {
***************
*** 8628,8634 ****
                  f->async_iconified = 0;
                  SET_FRAME_GARBAGED (f);
                  DebPrint (("frame %p (%s) reexposed by WM_PAINT\n", f,
!                            XSTRING (f->name)->data));
  
                  /* WM_PAINT serves as MapNotify as well, so report
                     visibility changes properly.  */
--- 8628,8634 ----
                  f->async_iconified = 0;
                  SET_FRAME_GARBAGED (f);
                  DebPrint (("frame %p (%s) reexposed by WM_PAINT\n", f,
!                            SDATA (f->name)));
  
                  /* WM_PAINT serves as MapNotify as well, so report
                     visibility changes properly.  */
***************
*** 9308,9314 ****
                  if (!FRAME_OBSCURED_P (f))
                    {
                      DebPrint (("frame %p (%s) obscured\n", f,
!                                XSTRING (f->name)->data));
                    }
                }
              else
--- 9308,9314 ----
                  if (!FRAME_OBSCURED_P (f))
                    {
                      DebPrint (("frame %p (%s) obscured\n", f,
!                                SDATA (f->name)));
                    }
                }
              else
***************
*** 9320,9326 ****
                    {
                      SET_FRAME_GARBAGED (f);
                      DebPrint (("obscured frame %p (%s) found to be 
visible\n", f,
!                                XSTRING (f->name)->data));
  
                      /* Force a redisplay sooner or later.  */
                      record_asynch_buffer_change ();
--- 9320,9326 ----
                    {
                      SET_FRAME_GARBAGED (f);
                      DebPrint (("obscured frame %p (%s) found to be 
visible\n", f,
!                                SDATA (f->name)));
  
                      /* Force a redisplay sooner or later.  */
                      record_asynch_buffer_change ();
***************
*** 9991,9997 ****
    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))
      {
--- 9991,9997 ----
    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))
      {
***************
*** 10121,10127 ****
         to do.  */
      return fontset_name (fontset);
  
!   result = x_new_font (f, (XSTRING (fontset_ascii (fontset))->data));
  
    if (!STRINGP (result))
      /* Can't load ASCII font.  */
--- 10121,10127 ----
         to do.  */
      return fontset_name (fontset);
  
!   result = x_new_font (f, (SDATA (fontset_ascii (fontset))));
  
    if (!STRINGP (result))
      /* Can't load ASCII font.  */
***************
*** 11047,11057 ****
    dpyinfo->name_list_element = XCAR (w32_display_name_list);
    
    dpyinfo->w32_id_name
!     = (char *) xmalloc (XSTRING (Vinvocation_name)->size
!                       + XSTRING (Vsystem_name)->size
                        + 2);
    sprintf (dpyinfo->w32_id_name, "address@hidden",
!          XSTRING (Vinvocation_name)->data, XSTRING (Vsystem_name)->data);
  
    /* Default Console mode values - overridden when running in GUI mode
       with values obtained from system metrics.  */
--- 11047,11057 ----
    dpyinfo->name_list_element = XCAR (w32_display_name_list);
    
    dpyinfo->w32_id_name
!     = (char *) xmalloc (SCHARS (Vinvocation_name)
!                       + SCHARS (Vsystem_name)
                        + 2);
    sprintf (dpyinfo->w32_id_name, "address@hidden",
!          SDATA (Vinvocation_name), SDATA (Vsystem_name));
  
    /* Default Console mode values - overridden when running in GUI mode
       with values obtained from system metrics.  */