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

[Ken Raeburn]

Index: emacs/src/sunfns.c
diff -c emacs/src/sunfns.c:1.22 emacs/src/sunfns.c:1.23
*** emacs/src/sunfns.c:1.22     Tue Nov 13 19:04:24 2001
--- emacs/src/sunfns.c  Sun Jul 14 20:00:37 2002
***************
*** 240,252 ****
      CHECK_NUMBER (X_Hot);
      CHECK_NUMBER (Y_Hot);
      CHECK_STRING (Data);
!     if (XSTRING(Data)->size != 32) return(Qnil);
      /*
       *        Setup the new cursor
       */
      NewCursor.cur_xhot = X_Hot;
      NewCursor.cur_yhot = Y_Hot;
!     cp = XSTRING(Data)->data;
      p = CursorData;
      i = 16;
      while(--i >= 0)
--- 240,252 ----
      CHECK_NUMBER (X_Hot);
      CHECK_NUMBER (Y_Hot);
      CHECK_STRING (Data);
!     if (SCHARS (Data) != 32) return(Qnil);
      /*
       *        Setup the new cursor
       */
      NewCursor.cur_xhot = X_Hot;
      NewCursor.cur_yhot = Y_Hot;
!     cp = SDATA (Data);
      p = CursorData;
      i = 16;
      while(--i >= 0)
***************
*** 267,273 ****
       struct selection *sel;
       FILE *file;
  {
!   fwrite (XSTRING (Current_Selection)->data, sizeof (char), 
          sel->sel_items, file);
  }
  
--- 267,273 ----
       struct selection *sel;
       FILE *file;
  {
!   fwrite (SDATA (Current_Selection), sizeof (char), 
          sel->sel_items, file);
  }
  
***************
*** 330,336 ****
  
    CHECK_GFX (Qnil);
    selection.sel_type = SELTYPE_CHAR;
!   selection.sel_items = XSTRING (str)->size;
    selection.sel_itembytes = 1;
    selection.sel_pubflags = 1;
    selection_set(&selection, sel_write, sel_clear, win_fd);
--- 330,336 ----
  
    CHECK_GFX (Qnil);
    selection.sel_type = SELTYPE_CHAR;
!   selection.sel_items = SCHARS (str);
    selection.sel_itembytes = 1;
    selection.sel_pubflags = 1;
    selection_set(&selection, sel_write, sel_clear, win_fd);
***************
*** 371,380 ****
    if (VECTORP (Value)) {
      submenu = sun_menu_create (Value);
      menu_item = menu_create_item
!       (MENU_RELEASE, MENU_PULLRIGHT_ITEM, XSTRING(String)->data, submenu, 0);
    } else {
      menu_item = menu_create_item
!       (MENU_RELEASE, MENU_STRING_ITEM, XSTRING(String)->data, Value, 0);
    }
    return menu_item;
  }
--- 371,380 ----
    if (VECTORP (Value)) {
      submenu = sun_menu_create (Value);
      menu_item = menu_create_item
!       (MENU_RELEASE, MENU_PULLRIGHT_ITEM, SDATA (String), submenu, 0);
    } else {
      menu_item = menu_create_item
!       (MENU_RELEASE, MENU_STRING_ITEM, SDATA (String), Value, 0);
    }
    return menu_item;
  }