diff options
| author | Jan Djärv | 2013-08-13 17:45:43 +0200 |
|---|---|---|
| committer | Jan Djärv | 2013-08-13 17:45:43 +0200 |
| commit | 96311be7a6d096a22574caceab652a04f918d479 (patch) | |
| tree | 103ad1b0dcd9e4bcd97ea3de2f636b73ce324bdc /src | |
| parent | f10490f024a5b06d593ae4c03f6371422e2b5a56 (diff) | |
| download | emacs-96311be7a6d096a22574caceab652a04f918d479.tar.gz emacs-96311be7a6d096a22574caceab652a04f918d479.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/nsterm.m | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dd6a2cc6283..70a1fa28db5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2013-08-13 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2013-08-13 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * nsterm.m (ns_set_vertical_scroll_bar): Fix breakage intruduced by | ||
| 4 | 2013-08-13 checkin below. Change bool to BOOL, rule is: | ||
| 5 | All Obj-C code uses BOOL, except for interfaces callable from C. | ||
| 6 | |||
| 3 | * nsterm.h: Fix CGFloat for OSX 10.4 (Bug#15086). | 7 | * nsterm.h: Fix CGFloat for OSX 10.4 (Bug#15086). |
| 4 | 8 | ||
| 5 | 2013-08-13 Dmitry Antipov <dmantipov@yandex.ru> | 9 | 2013-08-13 Dmitry Antipov <dmantipov@yandex.ru> |
diff --git a/src/nsterm.m b/src/nsterm.m index e1a60028ffc..f374bfd90c6 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -3703,7 +3703,7 @@ ns_set_vertical_scroll_bar (struct window *window, | |||
| 3703 | int window_y, window_height; | 3703 | int window_y, window_height; |
| 3704 | int top, left, height, width, sb_width, sb_left; | 3704 | int top, left, height, width, sb_width, sb_left; |
| 3705 | EmacsScroller *bar; | 3705 | EmacsScroller *bar; |
| 3706 | bool fringe_extended_p; | 3706 | BOOL fringe_extended_p; |
| 3707 | 3707 | ||
| 3708 | /* optimization; display engine sends WAY too many of these.. */ | 3708 | /* optimization; display engine sends WAY too many of these.. */ |
| 3709 | if (!NILP (window->vertical_scroll_bar)) | 3709 | if (!NILP (window->vertical_scroll_bar)) |
| @@ -3740,7 +3740,7 @@ ns_set_vertical_scroll_bar (struct window *window, | |||
| 3740 | v = [view frame]; | 3740 | v = [view frame]; |
| 3741 | r.origin.y = (v.size.height - r.size.height - r.origin.y); | 3741 | r.origin.y = (v.size.height - r.size.height - r.origin.y); |
| 3742 | 3742 | ||
| 3743 | fringe_extended_p = WINDOW_FRINGE_EXTENDED_P (w); | 3743 | fringe_extended_p = WINDOW_FRINGE_EXTENDED_P (window); |
| 3744 | 3744 | ||
| 3745 | XSETWINDOW (win, window); | 3745 | XSETWINDOW (win, window); |
| 3746 | block_input (); | 3746 | block_input (); |