# HG changeset patch
# User Katsumi Yamaoka <katsumi@flagship2>
# Date 1277813336 0
# Node ID 9f1761f4003907532dc69dfffa6716102abb11bf
# Parent  bb675fbc7bc62cb007bf7f12178da7c1c891c62a# Parent  8c3d7999284971511d068e8952783ab4a8e87d69
Merge from mainline.

diff -r bb675fbc7bc6 -r 9f1761f40039 src/ChangeLog
--- a/src/ChangeLog	Mon Jun 28 13:32:47 2010 +0000
+++ b/src/ChangeLog	Tue Jun 29 12:08:56 2010 +0000
@@ -1,3 +1,9 @@
+2010-06-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsfns.m: extern declare Vmenu_bar_mode, Vtool_bar_mode.
+	(ns_get_screen): Don't assign integer to f.
+	(Fx_display_color_cells): Declarations before statements.
+
 2010-06-28  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* xfns.c (x_default_font_parameter): Remove got_from_system
diff -r bb675fbc7bc6 -r 9f1761f40039 src/nsfns.m
--- a/src/nsfns.m	Mon Jun 28 13:32:47 2010 +0000
+++ b/src/nsfns.m	Tue Jun 29 12:08:56 2010 +0000
@@ -83,6 +83,10 @@
 extern Lisp_Object Qnone;
 extern Lisp_Object Vframe_title_format;
 
+/* The below are defined in frame.c.  */
+
+extern Lisp_Object Vmenu_bar_mode, Vtool_bar_mode;
+
 Lisp_Object Qbuffered;
 Lisp_Object Qfontsize;
 
@@ -224,7 +228,8 @@
   else
     {
       struct ns_display_info *dpyinfo = terminal->display_info.ns;
-      f = (dpyinfo->x_focus_frame || dpyinfo->x_highlight_frame);
+      f = dpyinfo->x_focus_frame
+        ? dpyinfo->x_focus_frame : dpyinfo->x_highlight_frame;
     }
 
   return ((f && FRAME_NS_P (f)) ? [[FRAME_NS_VIEW (f) window] screen]
@@ -2381,9 +2386,10 @@
      (display)
      Lisp_Object display;
 {
+  struct ns_display_info *dpyinfo;
   check_ns ();
-  struct ns_display_info *dpyinfo = check_ns_display_info (display);
-
+  
+  dpyinfo = check_ns_display_info (display);
   /* We force 24+ bit depths to 24-bit to prevent an overflow.  */
   return make_number (1 << min (dpyinfo->n_planes, 24));
 }