Mercurial > emacs
diff src/mac.c @ 61338:b44917251d3a
(cfdate_to_lisp): Add `const' for variable `epoch_gdate'.
(Fmac_get_preference): Doc fix.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Wed, 06 Apr 2005 02:23:37 +0000 |
| parents | 40fe172d199c |
| children | 72c95a1c84c6 02f1dbc4a199 |
line wrap: on
line diff
--- a/src/mac.c Wed Apr 06 02:17:38 2005 +0000 +++ b/src/mac.c Wed Apr 06 02:23:37 2005 +0000 @@ -364,13 +364,13 @@ /* 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 @@ 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 @@ 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 @@ 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);
