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

[YAMAMOTO Mitsuharu]

Index: emacs/src/mac.c
diff -c emacs/src/mac.c:1.30 emacs/src/mac.c:1.31
*** emacs/src/mac.c:1.30        Thu Mar 17 08:02:24 2005
--- emacs/src/mac.c     Wed Apr  6 02:23:37 2005
***************
*** 364,376 ****
  
  
  /* CFDate to a list of three integers as in a return value of
!    `current-time'xo.  */
  
  Lisp_Object
  cfdate_to_lisp (date)
       CFDateRef date;
  {
!   static CFGregorianDate epoch_gdate = {1970, 1, 1, 0, 0, 0.0};
    static CFAbsoluteTime epoch = 0.0, sec;
    int high, low;
  
--- 364,376 ----
  
  
  /* CFDate to a list of three integers as in a return value of
!    `current-time'.  */
  
  Lisp_Object
  cfdate_to_lisp (date)
       CFDateRef date;
  {
!   static const CFGregorianDate epoch_gdate = {1970, 1, 1, 0, 0, 0.0};
    static CFAbsoluteTime epoch = 0.0, sec;
    int high, low;
  
***************
*** 668,674 ****
      return Qnil;
  
    result = Fcons (component, result);
!   while (binding = parse_binding (p))
      {
        if (binding == '*')
        result = Fcons (LOOSE_BINDING, result);
--- 668,674 ----
      return Qnil;
  
    result = Fcons (component, result);
!   while ((binding = parse_binding (p)) != '\0')
      {
        if (binding == '*')
        result = Fcons (LOOSE_BINDING, result);
***************
*** 3662,3668 ****
    CFDate             List of three integers         date
                         (cf. `current-time')
    CFData             Unibyte string                 data
!   CFArray            Array                          array
    CFDictionary       Alist or hash table            dictionary
                         (depending on HASH-BOUND)
  
--- 3662,3668 ----
    CFDate             List of three integers         date
                         (cf. `current-time')
    CFData             Unibyte string                 data
!   CFArray            Vector                         array
    CFDictionary       Alist or hash table            dictionary
                         (depending on HASH-BOUND)
  
***************
*** 4174,4199 ****
    staticpro (&QCLIPBOARD);
  
  #if TARGET_API_MAC_CARBON
!   Qstring = intern ("string");
!   staticpro (&Qstring);
! 
!   Qnumber = intern ("number");
!   staticpro (&Qnumber);
! 
!   Qboolean = intern ("boolean");
!   staticpro (&Qboolean);
! 
!   Qdate = intern ("date");
!   staticpro (&Qdate);
! 
!   Qdata = intern ("data");
!   staticpro (&Qdata);
! 
!   Qarray = intern ("array");
!   staticpro (&Qarray);
! 
!   Qdictionary = intern ("dictionary");
!   staticpro (&Qdictionary);
  
    Qxml = intern ("xml");
    staticpro (&Qxml);
--- 4174,4186 ----
    staticpro (&QCLIPBOARD);
  
  #if TARGET_API_MAC_CARBON
!   Qstring  = intern ("string");               staticpro (&Qstring);
!   Qnumber  = intern ("number");               staticpro (&Qnumber);
!   Qboolean = intern ("boolean");      staticpro (&Qboolean);
!   Qdate          = intern ("date");           staticpro (&Qdate);
!   Qdata    = intern ("data");         staticpro (&Qdata);
!   Qarray   = intern ("array");                staticpro (&Qarray);
!   Qdictionary = intern ("dictionary");        staticpro (&Qdictionary);
  
    Qxml = intern ("xml");
    staticpro (&Qxml);