diff src/nsselect.m @ 102954:b5a34573cf82

* 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.

--- a/src/nsselect.m	Mon Apr 13 17:23:27 2009 +0000
+++ b/src/nsselect.m	Mon Apr 13 18:45:12 2009 +0000
@@ -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)