Mercurial > emacs
changeset 109233:9f1761f40039
Merge from mainline.
| author | Katsumi Yamaoka <katsumi@flagship2> |
|---|---|
| date | Tue, 29 Jun 2010 12:08:56 +0000 |
| parents | bb675fbc7bc6 (current diff) 8c3d79992849 (diff) |
| children | 810852b2385b |
| files | |
| diffstat | 2 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)); }