# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 892142462 0
# Node ID f23a3354d0ad85b8ce124297ad62e2c2cf74f0b5
# Parent  bd9b548fd162a459ab79522d0c76607b960ad7f4
(minmax): New macro.
(update_frame): Use it.

diff -r bd9b548fd162 -r f23a3354d0ad src/dispnew.c
--- a/src/dispnew.c	Thu Apr 09 17:07:32 1998 +0000
+++ b/src/dispnew.c	Thu Apr 09 17:21:02 1998 +0000
@@ -64,6 +64,8 @@
 
 #define max(a, b) ((a) > (b) ? (a) : (b))
 #define min(a, b) ((a) < (b) ? (a) : (b))
+#define minmax(floor, val, ceil) \
+	((val) < (floor) ? (floor) : (val) > (ceil) ? (ceil) : (val))
 
 /* Get number of chars of output now in the buffer of a stdio stream.
    This ought to be built in in stdio, but it isn't.
@@ -1357,8 +1359,7 @@
 	}
       else
 	cursor_to (FRAME_CURSOR_Y (f), 
-		   max (min (FRAME_CURSOR_X (f),
-			     FRAME_WINDOW_WIDTH (f) - 1), 0));
+		   minmax (0, FRAME_CURSOR_X (f), FRAME_WINDOW_WIDTH (f) - 1));
     }
 
   update_end (f);