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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b2b7ef7e12bc8af9387266d1876fa95ec2061582..430856df6d76160dadcb80ca6d3e723e6e960382 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
@@ -53,6 +64,7 @@
        (showhide-date-time): New function.
        (menu-bar-showhide-menu): New menu-item "Date and time".
 
+>>>>>>> 1.3409
 2002-02-03  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * mail/rmail.el (rmail): Use find-buffer-visiting instead of
@@ -75,6 +87,7 @@
        * dabbrev.el (dabbrev--goto-start-of-abbrev):
        Exit loop on beginning of field rather than bobp.
 
+>>>>>>> 1.3400
 2002-02-02  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * mail/uce.el (uce-reply-to-uce): Prune the headers before copying
@@ -132,6 +145,7 @@
 
        * hi-lock.el (hi-lock-find-patterns): Save restriction.
 
+>>>>>>> 1.3396
 2002-02-01  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * calendar/time-date.el: Moved from lisp/gnus.
@@ -188,6 +202,7 @@
        New functions (separated from command-line-1).
        (command-line-1): Use them.
 
+>>>>>>> 1.3390
 2002-01-28  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * calendar/calendar.el (generate-calendar-month): Doc fix.

diff --git a/lisp/play/pong.el b/lisp/play/pong.el
index 370a6665c85152dab4f620a281b3eeafb06915ea..36bd92137ec6d45343cff23d808e178bc9f7ba76 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))