From 4887c6e26e2d578f34e647d23a1a7352a48e94c4 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 15 Apr 2011 18:54:37 -0700 Subject: [PATCH] * xdisp.c, dispextern.h (set_vertical_scroll_bar): Now extern if USE_TOOLKIT_SCROLL_BARS && !USE_GTK, as xterm.c needs it then. --- src/ChangeLog | 5 +++++ src/dispextern.h | 3 +++ src/xdisp.c | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index a088c1b42d0..693c8e42ce3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-04-16 Paul Eggert + + * xdisp.c, dispextern.h (set_vertical_scroll_bar): Now extern if + USE_TOOLKIT_SCROLL_BARS && !USE_GTK, as xterm.c needs it then. + 2011-04-15 Paul Eggert * sysdep.c (emacs_read): Remove unnecessary check vs MAX_RW_COUNT. diff --git a/src/dispextern.h b/src/dispextern.h index 840a27ebc62..bda59d53055 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -2953,6 +2953,9 @@ int line_bottom_y (struct it *); int display_prop_intangible_p (Lisp_Object); void resize_echo_area_exactly (void); int resize_mini_window (struct window *, int); +#if defined USE_TOOLKIT_SCROLL_BARS && !defined USE_GTK +void set_vertical_scroll_bar (struct window *); +#endif int try_window (Lisp_Object, struct text_pos, int); void window_box (struct window *, int, int *, int *, int *, int *); int window_box_height (struct window *); diff --git a/src/xdisp.c b/src/xdisp.c index 4f1830f4c6c..f3928f3b209 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -13630,7 +13630,10 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste return rc; } -static void +#if !defined USE_TOOLKIT_SCROLL_BARS || defined USE_GTK +static +#endif +void set_vertical_scroll_bar (struct window *w) { EMACS_INT start, end, whole; -- 2.39.2