(pong-height): Don't use height that exceeds the frame height.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e204a9d253665fe470eea2df98887e4bb24f5227..2a0d095c00506946495452cc6acb9a69d96a6a67 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2002-02-06  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * play/pong.el (pong-height): Don't use height that exceeds the
+       frame height.
+
+       * play/gamegrid.el (gamegrid-display-type): Treat any
+       color-capable display as color-x, if display-color-p is fboundp.
+       (gamegrid-make-color-x-face): Don't call gamegrid-color twice.
+       (gamegrid-make-color-tty-face): Use the value of color, not the
+       symbol itself.  Don't call gamegrid-color.
+
 2002-02-05  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * gud.el (gud-refresh): Call recenter only after we are sure we

diff --git a/lisp/play/pong.el b/lisp/play/pong.el
index 2ba51efd1f216f26c054f2e3d2a718fd26d24903..dbacf176ff32a7a5216a1ef60ce1ca975a608ef5 100644 (file)
--- a/lisp/play/pong.el
+++ b/lisp/play/pong.el
@@ -49,7 +49,7 @@
   :group 'pong
   :type '(integer))
 
-(defcustom pong-height 30
+(defcustom pong-height (min 30 (- (frame-height) 6))
   "*Height of the playfield."
   :group 'pong
   :type '(integer))