From 32c0234912df99e00d6c6d22faa998043f30c8e9 Mon Sep 17 00:00:00 2001 From: pmai <pmai> Date: Tue, 11 Dec 2001 00:56:51 +0000 Subject: [PATCH] Fix redefinition of constants as special variables via defparameter, as uncovered by the recent change to detect this. Folded the larger constants for MINIMUM-WINDOW-LINES and MINIMUM-WINDOW-COLUMNS into the original constant definition, and elided the superfluous defparameter for FONT-MAP-SIZE. This seems to work for now. --- hemlock/bit-screen.lisp | 6 +++--- hemlock/hacks.lisp | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hemlock/bit-screen.lisp b/hemlock/bit-screen.lisp index 304747260..15fa28b2d 100644 --- a/hemlock/bit-screen.lisp +++ b/hemlock/bit-screen.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/bit-screen.lisp,v 1.17 2001/03/13 15:49:50 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/bit-screen.lisp,v 1.18 2001/12/11 00:56:51 pmai Rel $") ;;; ;;; ********************************************************************** ;;; @@ -652,9 +652,9 @@ ;;; The width must be that of a tab for the screen image builder, and the ;;; height must be one line (two with a modeline). ;;; -(defconstant minimum-window-lines 1 +(defconstant minimum-window-lines 2 "Windows must have at least this many lines.") -(defconstant minimum-window-columns 8 +(defconstant minimum-window-columns 10 "Windows must be at least this many characters wide.") (eval-when (compile eval load) diff --git a/hemlock/hacks.lisp b/hemlock/hacks.lisp index df924a48d..882fc97c8 100644 --- a/hemlock/hacks.lisp +++ b/hemlock/hacks.lisp @@ -17,9 +17,6 @@ (setf (window-old-lines window) 0)) (defparameter hunk-width-limit 256) -(defparameter minimum-window-lines 2) -(defparameter minimum-window-columns 10) -(defparameter font-map-size 16) (defun reverse-video-hook-fun (&rest foo) (declare (ignore foo))) -- GitLab