[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100660: Fix some compilation errors
From: |
Jan D |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100660: Fix some compilation errors in nsfns.c |
Date: |
Tue, 29 Jun 2010 11:49:20 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100660
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Tue 2010-06-29 11:49:20 +0200
message:
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.
modified:
src/ChangeLog
src/nsfns.m
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-06-28 12:46:39 +0000
+++ b/src/ChangeLog 2010-06-29 09:49:20 +0000
@@ -1,3 +1,9 @@
+2010-06-29 Jan Djärv <address@hidden>
+
+ * 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 <address@hidden>
* xfns.c (x_default_font_parameter): Remove got_from_system
=== modified file 'src/nsfns.m'
--- a/src/nsfns.m 2010-06-27 00:30:52 +0000
+++ b/src/nsfns.m 2010-06-29 09:49:20 +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));
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100660: Fix some compilation errors in nsfns.c,
Jan D <=