diff options
| author | Joakim Verona | 2015-01-15 14:54:25 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-15 14:54:25 +0100 |
| commit | 0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d (patch) | |
| tree | 6c7ea25ac137f5764d931e841598a3c1ea434ab0 /src/xterm.c | |
| parent | a1124bc117e41019de49c82d13d1a72a50df977d (diff) | |
| parent | 0e97c44c3699c4606a04f589828acdf9c03f447e (diff) | |
| download | emacs-0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d.tar.gz emacs-0298a2c6a10bc3b79cb2f45a1961dd7ac6da4e6d.zip | |
merge master
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xterm.c b/src/xterm.c index 9a87a1ee49c..40043dc9430 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -3051,7 +3051,7 @@ XTflash (struct frame *f) | |||
| 3051 | gc = gdk_gc_new_with_values (window, | 3051 | gc = gdk_gc_new_with_values (window, |
| 3052 | &vals, GDK_GC_FUNCTION | GDK_GC_FOREGROUND); | 3052 | &vals, GDK_GC_FUNCTION | GDK_GC_FOREGROUND); |
| 3053 | #define XFillRectangle(d, win, gc, x, y, w, h) \ | 3053 | #define XFillRectangle(d, win, gc, x, y, w, h) \ |
| 3054 | gdk_draw_rectangle (window, gc, TRUE, x, y, w, h) | 3054 | gdk_draw_rectangle (window, gc, true, x, y, w, h) |
| 3055 | #endif /* ! HAVE_GTK3 */ | 3055 | #endif /* ! HAVE_GTK3 */ |
| 3056 | #else /* ! USE_GTK */ | 3056 | #else /* ! USE_GTK */ |
| 3057 | GC gc; | 3057 | GC gc; |
| @@ -4604,7 +4604,7 @@ xg_scroll_callback (GtkRange *range, | |||
| 4604 | GtkAdjustment *adj = GTK_ADJUSTMENT (gtk_range_get_adjustment (range)); | 4604 | GtkAdjustment *adj = GTK_ADJUSTMENT (gtk_range_get_adjustment (range)); |
| 4605 | struct frame *f = g_object_get_data (G_OBJECT (range), XG_FRAME_DATA); | 4605 | struct frame *f = g_object_get_data (G_OBJECT (range), XG_FRAME_DATA); |
| 4606 | 4606 | ||
| 4607 | if (xg_ignore_gtk_scrollbar) return FALSE; | 4607 | if (xg_ignore_gtk_scrollbar) return false; |
| 4608 | 4608 | ||
| 4609 | switch (scroll) | 4609 | switch (scroll) |
| 4610 | { | 4610 | { |
| @@ -4660,7 +4660,7 @@ xg_scroll_callback (GtkRange *range, | |||
| 4660 | bar->horizontal); | 4660 | bar->horizontal); |
| 4661 | } | 4661 | } |
| 4662 | 4662 | ||
| 4663 | return FALSE; | 4663 | return false; |
| 4664 | } | 4664 | } |
| 4665 | 4665 | ||
| 4666 | /* Callback for button release. Sets dragging to -1 when dragging is done. */ | 4666 | /* Callback for button release. Sets dragging to -1 when dragging is done. */ |
| @@ -4679,7 +4679,7 @@ xg_end_scroll_callback (GtkWidget *widget, | |||
| 4679 | window_being_scrolled = Qnil; | 4679 | window_being_scrolled = Qnil; |
| 4680 | } | 4680 | } |
| 4681 | 4681 | ||
| 4682 | return FALSE; | 4682 | return false; |
| 4683 | } | 4683 | } |
| 4684 | 4684 | ||
| 4685 | 4685 | ||