* xdisp.c, dispextern.h (set_vertical_scroll_bar): Now extern if

USE_TOOLKIT_SCROLL_BARS && !USE_GTK, as xterm.c needs it then.

diff --git a/src/ChangeLog b/src/ChangeLog
index a088c1b42d0d39b7993152ae6a173d1c16b20a13..693c8e42ce3c63daf8e055fde2ed8d75ddf9a786 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * 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  <eggert@cs.ucla.edu>
 
        * sysdep.c (emacs_read): Remove unnecessary check vs MAX_RW_COUNT.

diff --git a/src/dispextern.h b/src/dispextern.h
index 840a27ebc6278a6af3b8b7ea7e4ffe176324eed1..bda59d53055bdaeaa90f22b70638cbd30c490b98 100644 (file)
--- 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 4f1830f4c6ca7b0224a9061892333255d9513ff7..f3928f3b2095dcd7df632355a4f0a048bb36ce3c 100644 (file)
--- 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;