* dispnew.c (set_window_cursor_after_update): Use clip_to_bounds.

* gtkutil.c (xg_set_toolkit_scroll_bar_thumb):
* window.c (Frecenter):
* xdisp.c (resize_mini_window, hscroll_window_tree, draw_glyphs):
* xterm.c (x_set_toolkit_scroll_bar_thumb): Likewise.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/window.c b/src/window.c
index f696e3c2a1b..28c3bf93553 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5347,8 +5347,8 @@ and redisplay normally--don't erase and redraw the frame.  */)
         iarg += ht;
 
       /* Don't let it get into the margin at either top or bottom.  */
-      iarg = max (iarg, this_scroll_margin);
-      iarg = min (iarg, ht - this_scroll_margin - 1);
+      iarg = clip_to_bounds (this_scroll_margin, iarg,
+                             ht - this_scroll_margin - 1);
 
       pos = *vmotion (PT, - iarg, w);
       charpos = pos.bufpos;