[Emacs-diffs] emacs/src ChangeLog lisp.h nsfont.m nsimage.m n...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/04/13 18:45:15

Modified files:
        src            : ChangeLog lisp.h nsfont.m nsimage.m nsmenu.m 
                         nsselect.m 

Log message:
        * nsselect.m (symbol_to_nsstring, clean_local_selection_data)
        (ns_string_to_pasteboard_internal):
        * nsmenu.m (process_dialog):
        * nsimage.m (ns_load_image): Use SDATA and ASET where appropriate.
        * nsfont.m (nsfont_open): Use XHASH to make it compile with LISP_UNION.
        * lisp.h (Fx_load_color_file): Declare.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7479&r2=1.7480
http://cvs.savannah.gnu.org/viewcvs/emacs/src/lisp.h?cvsroot=emacs&r1=1.655&r2=1.656
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsfont.m?cvsroot=emacs&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsimage.m?cvsroot=emacs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsmenu.m?cvsroot=emacs&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsselect.m?cvsroot=emacs&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7479
retrieving revision 1.7480
diff -u -b -r1.7479 -r1.7480
--- ChangeLog   13 Apr 2009 12:41:33 -0000      1.7479
+++ ChangeLog   13 Apr 2009 18:45:12 -0000      1.7480
@@ -1,3 +1,12 @@
+2009-04-13  Stefan Monnier  <address@hidden>
+
+       * nsselect.m (symbol_to_nsstring, clean_local_selection_data)
+       (ns_string_to_pasteboard_internal):
+       * nsmenu.m (process_dialog):
+       * nsimage.m (ns_load_image): Use SDATA and ASET where appropriate.
+       * nsfont.m (nsfont_open): Use XHASH to make it compile with LISP_UNION.
+       * lisp.h (Fx_load_color_file): Declare.
+
 2009-04-13  Kenichi Handa  <address@hidden>
 
        * font.c (font_delete_unmatched): Preserve the order of list

Index: lisp.h
===================================================================
RCS file: /sources/emacs/emacs/src/lisp.h,v
retrieving revision 1.655
retrieving revision 1.656
diff -u -b -r1.655 -r1.656
--- lisp.h      28 Mar 2009 04:53:06 -0000      1.655
+++ lisp.h      13 Apr 2009 18:45:14 -0000      1.656
@@ -3330,6 +3330,7 @@
 
 /* Defined in xfaces.c */
 EXFUN (Fclear_face_cache, 1);
+EXFUN (Fx_load_color_file, 1);
 extern void syms_of_xfaces P_ ((void));
 
 #ifndef HAVE_GETLOADAVG

Index: nsfont.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfont.m,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- nsfont.m    14 Mar 2009 21:20:07 -0000      1.20
+++ nsfont.m    13 Apr 2009 18:45:15 -0000      1.21
@@ -576,7 +576,9 @@
     {
       if (NSFONT_TRACE)
         fprintf(stderr, "*** nsfont_open CACHE HIT!\n");
-      return (Lisp_Object)[cached unsignedLongValue];
+      // FIXME: Cast from (unsigned long) to Lisp_Object.
+      XHASH (font_object) = [cached unsignedLongValue];
+      return font_object;
     }
   else
     {
@@ -585,7 +587,7 @@
       if (!synthItal)
         [fontCache
           setObject: [NSNumber numberWithUnsignedLong:
-                                 (unsigned long)font_object]
+                                 (unsigned long) XHASH (font_object)]
           forKey: nsfont];
     }
 

Index: nsimage.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsimage.m,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- nsimage.m   23 Jan 2009 14:08:24 -0000      1.9
+++ nsimage.m   13 Apr 2009 18:45:15 -0000      1.10
@@ -93,7 +93,7 @@
     }
   else
     {
-      NSData *data = [NSData dataWithBytes: XSTRING (spec_data)->data
+      NSData *data = [NSData dataWithBytes: SDATA (spec_data)
                                     length: SBYTES (spec_data)];
       eImg = [[EmacsImage alloc] initWithData: data];
       [eImg setPixmapData];

Index: nsmenu.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsmenu.m,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- nsmenu.m    6 Mar 2009 19:06:45 -0000       1.21
+++ nsmenu.m    13 Apr 2009 18:45:15 -0000      1.22
@@ -1717,11 +1717,11 @@
       item = XCAR (list);
       if (XTYPE (item) == Lisp_String)
         {
-          [window addString: XSTRING (item)->data row: row++];
+          [window addString: SDATA (item) row: row++];
         }
       else if (XTYPE (item) == Lisp_Cons)
         {
-          [window addButton: XSTRING (XCAR (item))->data
+          [window addButton: SDATA (XCAR (item))
                       value: XCDR (item) row: row++];
         }
       else if (NILP (item))
@@ -1811,7 +1811,7 @@
 
   if (XTYPE (head) == Lisp_String)
       [title setStringValue:
-                 [NSString stringWithUTF8String: XSTRING (head)->data]];
+                 [NSString stringWithUTF8String: SDATA (head)]];
   else if (isQ == YES)
       [title setStringValue: @"Question"];
   else

Index: nsselect.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsselect.m,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- nsselect.m  22 Jan 2009 13:55:44 -0000      1.11
+++ nsselect.m  13 Apr 2009 18:45:15 -0000      1.12
@@ -62,7 +62,7 @@
   if (EQ (sym, QPRIMARY))     return NSGeneralPboard;
   if (EQ (sym, QSECONDARY))   return NXSecondaryPboard;
   if (EQ (sym, QTEXT))        return NSStringPboardType;
-  return [NSString stringWithUTF8String: XSTRING (XSYMBOL (sym)->xname)->data];
+  return [NSString stringWithUTF8String: SDATA (XSYMBOL (sym)->xname)];
 }
 
 
@@ -113,7 +113,7 @@
         return clean_local_selection_data (AREF (obj, 0));
       copy = Fmake_vector (make_number (size), Qnil);
       for (i = 0; i < size; i++)
-        AREF (copy, i) = clean_local_selection_data (AREF (obj, i));
+        ASET (copy, i, clean_local_selection_data (AREF (obj, i)));
       return copy;
     }
 
@@ -150,7 +150,7 @@
 
       CHECK_STRING (str);
 
-      utfStr = XSTRING (str)->data;
+      utfStr = SDATA (str);
       nsStr = [NSString stringWithUTF8String: utfStr];
 
       if (gtype == nil)