[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113848: Fix NS compile breakage.
From: |
Jan D. |
Subject: |
[Emacs-diffs] trunk r113848: Fix NS compile breakage. |
Date: |
Tue, 13 Aug 2013 15:45:45 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113848
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-13 17:45:43 +0200
message:
Fix NS compile breakage.
* nsterm.m (ns_set_vertical_scroll_bar): Fix breakage intruduced by
2013-08-13 checkin below. Change bool to BOOL, rule is:
All Obj-C code uses BOOL, except for interfaces callable from C.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/nsterm.m nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-08-13 15:39:14 +0000
+++ b/src/ChangeLog 2013-08-13 15:45:43 +0000
@@ -1,5 +1,9 @@
2013-08-13 Jan Djärv <address@hidden>
+ * nsterm.m (ns_set_vertical_scroll_bar): Fix breakage intruduced by
+ 2013-08-13 checkin below. Change bool to BOOL, rule is:
+ All Obj-C code uses BOOL, except for interfaces callable from C.
+
* nsterm.h: Fix CGFloat for OSX 10.4 (Bug#15086).
2013-08-13 Dmitry Antipov <address@hidden>
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2013-08-13 15:29:25 +0000
+++ b/src/nsterm.m 2013-08-13 15:45:43 +0000
@@ -3703,7 +3703,7 @@
int window_y, window_height;
int top, left, height, width, sb_width, sb_left;
EmacsScroller *bar;
- bool fringe_extended_p;
+ BOOL fringe_extended_p;
/* optimization; display engine sends WAY too many of these.. */
if (!NILP (window->vertical_scroll_bar))
@@ -3740,7 +3740,7 @@
v = [view frame];
r.origin.y = (v.size.height - r.size.height - r.origin.y);
- fringe_extended_p = WINDOW_FRINGE_EXTENDED_P (w);
+ fringe_extended_p = WINDOW_FRINGE_EXTENDED_P (window);
XSETWINDOW (win, window);
block_input ();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113848: Fix NS compile breakage.,
Jan D. <=