diff --git a/ChangeLog.n b/ChangeLog.n index 8f161337a956f42483711e5d44c3a7dea5414200..3343c908ba143e6f117b1152423a61dba888d9f1 100644 --- a/ChangeLog.n +++ b/ChangeLog.n @@ -10,6 +10,10 @@ Tests for new features: <`no new features', `no tests for new features', or <standard changelog date stamp> * <changes go here...> +******************************************************************************* +2.2.2.4 -- join from acl50 branch (version 2.2.1.33) +next merge tag: acl50_merge4 + ******************************************************************************* 2.2.2.3 -- join from acl50 branch next merge tag: acl50_merge3 @@ -47,6 +51,14 @@ next merge tag: acl50_merge2 (this should have been version 2.2.2.0, but was 2.2.1.17 instead) next merge tag: acl50_merge1 +******************************************************************************* +2.2.1.33 + +1998-11-03 <layer@HOBART> + + * pre-silica/genera-implementation.lisp: remove ^Z character + because it was messing up new version of CVS + ******************************************************************************* 2.2.1.32 diff --git a/pre-silica/genera-implementation.lisp b/pre-silica/genera-implementation.lisp index b89fd1877bc8c8f33921480433775b9af1eec681..1cedb48c3730318a4de81d3ece0cdb4bde3eb8f0 100644 --- a/pre-silica/genera-implementation.lisp +++ b/pre-silica/genera-implementation.lisp @@ -1,6 +1,6 @@ ;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*- -;; $Id: genera-implementation.lisp,v 1.10 1998/08/06 23:16:52 layer Exp $ +;; $Id: genera-implementation.lisp,v 1.11 1998/11/10 22:03:18 layer Exp $ (in-package :clim-internals) @@ -1075,7 +1075,7 @@ (setq index new-index)) (let ((new-top (box-top (presentation-displayed-box (aref displayed-strings index))))) - (when ( new-top y) + (when (-control-z-char- new-top y) (setq y new-top) (loop-finish)))) while (index-ok-p index)) diff --git a/utils/packages.lisp b/utils/packages.lisp index 6fae46b2555651a2dd89d26b5e50864911d25a0c..c654b48ab5ba54ae88731d4659f61f6f6dbcb91e 100644 --- a/utils/packages.lisp +++ b/utils/packages.lisp @@ -16,7 +16,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Id: packages.lisp,v 1.88 1998/10/08 18:36:27 layer Exp $ +;; $Id: packages.lisp,v 1.89 1998/11/10 22:03:20 layer Exp $ (in-package :common-lisp-user) @@ -3315,7 +3315,7 @@ (cl:defvar *clim-major-version* 2) (cl:defvar *clim-minor-version* 2) (cl:defvar *clim-generation-version* 2) -(cl:defvar *clim-build-version* 3) +(cl:defvar *clim-build-version* 4) (cl:defparameter *clim-version* (cl:format () "~d.~d.~d.~a"