Merged from miles@gnu.org--gnu-2005 (patch 56-58, 232-239)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-232
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-233
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-234
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-235
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-236
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-237
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-238
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-239
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-56
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-57
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-58
   Collapse feature addition/removal within single ChangeLog entry 

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-325

1 files changed, 11 insertions, 24 deletions

diff --git a/src/mac.c b/src/mac.c
index f5fc62b2200..da6a61633dc 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -364,13 +364,13 @@ cfnumber_to_lisp (number)
 
 
 /* CFDate to a list of three integers as in a return value of
-   `current-time'xo.  */
+   `current-time'.  */
 
 Lisp_Object
 cfdate_to_lisp (date)
      CFDateRef date;
 {
-  static CFGregorianDate epoch_gdate = {1970, 1, 1, 0, 0, 0.0};
+  static const CFGregorianDate epoch_gdate = {1970, 1, 1, 0, 0, 0.0};
   static CFAbsoluteTime epoch = 0.0, sec;
   int high, low;
 
@@ -668,7 +668,7 @@ parse_resource_name (p)
     return Qnil;
 
   result = Fcons (component, result);
-  while (binding = parse_binding (p))
+  while ((binding = parse_binding (p)) != '\0')
     {
       if (binding == '*')
         result = Fcons (LOOSE_BINDING, result);
@@ -3662,7 +3662,7 @@ corresponding Lisp object as follows:
   CFDate             List of three integers         date
                        (cf. `current-time')
   CFData             Unibyte string                 data
-  CFArray            Array                          array
+  CFArray            Vector                         array
   CFDictionary       Alist or hash table            dictionary
                        (depending on HASH-BOUND)
 
@@ -4174,26 +4174,13 @@ syms_of_mac ()
   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);
+  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);