Commit 5d1d3d04 authored by Jan D's avatar Jan D

Fix some compilation errors in nsfns.c

* 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.
parent 62d115ef
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
......
......@@ -83,6 +83,10 @@ Updated by Christian Limpach (chris@nice.ch)
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 @@ Updated by Christian Limpach (chris@nice.ch)
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 @@ The return value is a list of integers (LEFT TOP WIDTH HEIGHT), which
(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));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment