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

[Miles Bader]

Index: emacs/src/sunfns.c
diff -c emacs/src/sunfns.c:1.23 emacs/src/sunfns.c:1.24
*** emacs/src/sunfns.c:1.23     Sun Jul 14 20:00:37 2002
--- emacs/src/sunfns.c  Tue Feb  4 09:03:13 2003
***************
*** 158,164 ****
  {
    struct timeval Timeout;
    int waitmask = 1;
!   
    CHECK_NUMBER (n);
    Timeout.tv_sec = XINT(n) / 1000;
    Timeout.tv_usec = (XINT(n) - (Timeout.tv_sec * 1000)) * 1000;
--- 158,164 ----
  {
    struct timeval Timeout;
    int waitmask = 1;
! 
    CHECK_NUMBER (n);
    Timeout.tv_sec = XINT(n) / 1000;
    Timeout.tv_usec = (XINT(n) - (Timeout.tv_sec * 1000)) * 1000;
***************
*** 178,184 ****
  /*
   *   Sun sleep-for (allows a shorter interval than the regular sleep-for)
   */
! DEFUN ("sleep-for-millisecs", 
         Fsleep_for_millisecs,
         Ssleep_for_millisecs, 1, 1, 0,
         doc: /* Pause, without updating display, for ARG milliseconds.  */)
--- 178,184 ----
  /*
   *   Sun sleep-for (allows a shorter interval than the regular sleep-for)
   */
! DEFUN ("sleep-for-millisecs",
         Fsleep_for_millisecs,
         Ssleep_for_millisecs, 1, 1, 0,
         doc: /* Pause, without updating display, for ARG milliseconds.  */)
***************
*** 220,231 ****
    register short *p;
    register int i;
    Lisp_Object X_Hot, Y_Hot, Data;
!   
    CHECK_GFX (Qnil);
    /*
     *  If the icon is null, we just restore the DefaultCursor
     */
!   if (NILP(Icon)) 
      CurrentCursor = DefaultCursor;
    else {
      /*
--- 220,231 ----
    register short *p;
    register int i;
    Lisp_Object X_Hot, Y_Hot, Data;
! 
    CHECK_GFX (Qnil);
    /*
     *  If the icon is null, we just restore the DefaultCursor
     */
!   if (NILP(Icon))
      CurrentCursor = DefaultCursor;
    else {
      /*
***************
*** 236,242 ****
      X_Hot = XVECTOR(Icon)->contents[0];
      Y_Hot = XVECTOR(Icon)->contents[1];
      Data = XVECTOR(Icon)->contents[2];
!     
      CHECK_NUMBER (X_Hot);
      CHECK_NUMBER (Y_Hot);
      CHECK_STRING (Data);
--- 236,242 ----
      X_Hot = XVECTOR(Icon)->contents[0];
      Y_Hot = XVECTOR(Icon)->contents[1];
      Data = XVECTOR(Icon)->contents[2];
! 
      CHECK_NUMBER (X_Hot);
      CHECK_NUMBER (Y_Hot);
      CHECK_STRING (Data);
***************
*** 267,273 ****
       struct selection *sel;
       FILE *file;
  {
!   fwrite (SDATA (Current_Selection), sizeof (char), 
          sel->sel_items, file);
  }
  
--- 267,273 ----
       struct selection *sel;
       FILE *file;
  {
!   fwrite (SDATA (Current_Selection), sizeof (char),
          sel->sel_items, file);
  }
  
***************
*** 285,291 ****
  {
    register int i, n;
    register char *cp;
!   
    Current_Selection = make_string ("", 0);
    if (sel->sel_items <= 0)
      return (0);
--- 285,291 ----
  {
    register int i, n;
    register char *cp;
! 
    Current_Selection = make_string ("", 0);
    if (sel->sel_items <= 0)
      return (0);
***************
*** 306,312 ****
     * The shelltool select saves newlines as carriage returns,
     * but emacs wants newlines.
     */
!   for (i = 0; i < n; i++) 
      if (cp[i] == '\r') cp[i] = '\n';
  
    Current_Selection = make_string (cp, n);
--- 306,312 ----
     * The shelltool select saves newlines as carriage returns,
     * but emacs wants newlines.
     */
!   for (i = 0; i < n; i++)
      if (cp[i] == '\r') cp[i] = '\n';
  
    Current_Selection = make_string (cp, n);
***************
*** 379,394 ****
    return menu_item;
  }
  
! Menu 
  sun_menu_create (Vector)
       Lisp_Object Vector;
  {
    Menu menu;
    int i;
    CHECK_VECTOR(Vector);
!   menu=menu_create(0); 
    for(i = 0; i < XVECTOR(Vector)->size; i++) {
!     menu_set (menu, MENU_APPEND_ITEM, 
              sun_item_create(XVECTOR(Vector)->contents[i]), 0);
    }
    return menu;
--- 379,394 ----
    return menu_item;
  }
  
! Menu
  sun_menu_create (Vector)
       Lisp_Object Vector;
  {
    Menu menu;
    int i;
    CHECK_VECTOR(Vector);
!   menu=menu_create(0);
    for(i = 0; i < XVECTOR(Vector)->size; i++) {
!     menu_set (menu, MENU_APPEND_ITEM,
              sun_item_create(XVECTOR(Vector)->contents[i]), 0);
    }
    return menu;
***************
*** 445,451 ****
    Event event0;
    Event *event = &event0;
    Lisp_Object Value, Pair;
!   
    CHECK_NUMBER(X_Position);
    CHECK_NUMBER(Y_Position);
    CHECK_LIVE_WINDOW(window);
--- 445,451 ----
    Event event0;
    Event *event = &event0;
    Lisp_Object Value, Pair;
! 
    CHECK_NUMBER(X_Position);
    CHECK_NUMBER(Y_Position);
    CHECK_LIVE_WINDOW(window);