* Makefile.in: Undef LIB_STANDARD before defining it to silence warning

in case it was defined already.
USE @GNUSTEP_MAKEFILES@ rather than envvars.
* nsterm.m (ns_term_init): Pass Qt and Qnil rather than YES/NO to
ns_default.
(applicationShouldTerminate, setValuesFromPanel): Use EQ to compare
Lisp_Objects.
* nsterm.h (Fx_display_grayscale_p, Fx_display_planes)
(ns_defined_color, ns_color_to_lisp): Declare.
* nsselect.m (ns_handle_selection_request, ns_handle_selection_clear)
(Fns_own_selection_internal): Make the big ugly hack more explicit, so
it's accepted even with USE_LISP_UNION_TYPE.
* nsmenu.m (ns_update_menubar): Use EQ to compare Lisp_Objects.
(update_frame_tool_bar): Remove apparently obsolete tests for
non-integerness of f->tool_bar_lines.
(windowShouldClose, addButton, clicked, runDialogAt): Make the big ugly
hack more explicit, so it's accepted even with USE_LISP_UNION_TYPE.
* nsfont.m (nsfont_driver): Use just 0 rather than an invalid cast.
(nsfont_open): Don't confuse NULL for Qnil.
* nsfns.m (ns_implicitly_set_icon_type): Use EQ to compare Lisp_Objects.
* menu.h (find_and_call_menu_selection):
* menu.c (find_and_call_menu_selection): Use just int for vector size.
(find_and_return_menu_selection): Always return something.
* frame.h: Include dispextern.h for Display_Info.
(display_x_get_resource): Declare.
* configure.in: Extract and substitute GNUSTEP_MAKEFILES.

1 files changed, 24 insertions, 22 deletions

diff --git a/src/nsmenu.m b/src/nsmenu.m
index e48a82b7d2d..7fbc1b10c0a 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -401,9 +401,9 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu)
         {
           for (i = 0; i<n; i++)
             {
-              string = XVECTOR (items)->contents[4*i+1];
+              string = AREF (items, 4*i+1);
 
-              if (!string)
+              if (EQ (string, make_number (0))) // FIXME: Why???  --Stef
                 continue;
               if (NILP (string))
                 if (previous_strings[i][0])
@@ -691,10 +691,10 @@ name_is_separator (name)
 - (EmacsMenu *)addSubmenuWithTitle: (char *)title forFrame: (struct frame *)f
 {
   NSString *titleStr = [NSString stringWithUTF8String: title];
-  id <NSMenuItem> item =
-    [self addItemWithTitle: titleStr
-                    action: nil /*@selector (menuDown:) */
-             keyEquivalent: @""];
+  id <NSMenuItem> item
+      = [self addItemWithTitle: titleStr
+                        action: nil /*@selector (menuDown:) */
+                 keyEquivalent: @""];
   EmacsMenu *submenu = [[EmacsMenu alloc] initWithTitle: titleStr frame: f];
   [self setSubmenu: submenu forItem: item];
   [submenu release];
@@ -724,8 +724,9 @@ name_is_separator (name)
   [NSMenu popUpContextMenu: self withEvent: event forView: view];
   retVal = context_menu_value;
   context_menu_value = 0;
-  return retVal > 0 ?
-    find_and_return_menu_selection (f, keymaps, (void *)retVal) : Qnil;
+  return retVal > 0
+      ? find_and_return_menu_selection (f, keymaps, (void *)retVal)
+      : Qnil;
 }
 
 @end  /* EmacsMenu */
@@ -1061,8 +1062,8 @@ ns_popup_menu (Lisp_Object position, Lisp_Object menu)
           /* If this item has a null value,
              make the call_data null so that it won't display a box
              when the mouse is on it.  */
-          wv->call_data =
-            !NILP (def) ? (void *) &XVECTOR (menu_items)->contents[i] : 0;
+          wv->call_data
+              = !NILP (def) ? (void *) &XVECTOR (menu_items)->contents[i] : 0;
           wv->enabled = !NILP (enable);
 
           if (NILP (type))
@@ -1157,9 +1158,6 @@ update_frame_tool_bar (FRAME_PTR f)
   int i;
   EmacsToolbar *toolbar = [FRAME_NS_VIEW (f) toolbar];
 
-  if (NILP (f->tool_bar_lines) || !INTEGERP (f->tool_bar_lines))
-    return;
-
   [toolbar clearActive];
 
   /* update EmacsToolbar as in GtkUtils, build items list */
@@ -1294,8 +1292,8 @@ update_frame_tool_bar (FRAME_PTR f)
                         helpText: (char *)help enabled: (BOOL)enabled
 {
   /* 1) come up w/identifier */
-  NSString *identifier =
-    [NSString stringWithFormat: @"%u", [img hash]];
+  NSString *identifier
+      = [NSString stringWithFormat: @"%u", [img hash]];
 
   /* 2) create / reuse item */
   NSToolbarItem *item = [identifierToItem objectForKey: identifier];
@@ -1557,7 +1555,7 @@ ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header)
   NSSize spacing = {SPACER, SPACER};
   NSRect area;
   char this_cmd_name[80];
-  id cell, tem;
+  id cell;
   static NSImageView *imgView;
   static FlippedView *contentView;
 
@@ -1649,7 +1647,7 @@ ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header)
 
 - (BOOL)windowShouldClose: (id)sender
 {
-  [NSApp stopModalWithCode: Qnil];
+  [NSApp stopModalWithCode: XHASH (Qnil)]; // FIXME: BIG UGLY HACK!!
   return NO;
 }
 
@@ -1693,7 +1691,7 @@ void process_dialog (id window, Lisp_Object list)
   [cell setTarget: self];
   [cell setAction: @selector (clicked: )];
   [cell setTitle: [NSString stringWithUTF8String: str]];
-  [cell setTag: (int)val];
+  [cell setTag: XHASH (val)];   // FIXME: BIG UGLY HACK!!
   [cell setBordered: YES];
   [cell setEnabled: YES];
 
@@ -1730,14 +1728,14 @@ void process_dialog (id window, Lisp_Object list)
 - clicked: sender
 {
   NSArray *sellist = nil;
-  Lisp_Object seltag;
+  EMACS_INT seltag;
 
   sellist = [sender selectedCells];
   if ([sellist count]<1) 
     return self;
 
-  seltag = (Lisp_Object)[[sellist objectAtIndex: 0] tag];
-  if (! EQ (seltag, Qundefined))
+  seltag = [[sellist objectAtIndex: 0] tag];
+  if (seltag == XHASH (Qundefined)) // FIXME: BIG UGLY HACK!!
     [NSApp stopModalWithCode: seltag];
   return self;
 }
@@ -1844,7 +1842,11 @@ void process_dialog (id window, Lisp_Object list)
     }
   [NSApp endModalSession: session];
 
-  return (Lisp_Object)ret;
+  {                             // FIXME: BIG UGLY HACK!!!
+      Lisp_Object tmp;
+      *(EMACS_INT*)(&tmp) = ret;
+      return tmp;
+  }
 }
 
 @end