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

1 files changed, 4 insertions, 2 deletions

diff --git a/src/nsfont.m b/src/nsfont.m
index 902e73d48e9..b2e9c82bd67 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -576,7 +576,9 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
     {
       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 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
       if (!synthItal)
         [fontCache
           setObject: [NSNumber numberWithUnsignedLong:
-                                 (unsigned long)font_object]
+                                 (unsigned long) XHASH (font_object)]
           forKey: nsfont];
     }