From 019eea8df31d5c101026a60fc179abd78a7fe62e Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 10 Jan 2003 18:52:09 +0000
Subject: [PATCH] Order predicates for keys must also handle buttons. 
 Otherwise, the code that sorts key bindings will break.

---
 v7/src/edwin/calias.scm | 4 ++--
 v7/src/edwin/edtstr.scm | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/v7/src/edwin/calias.scm b/v7/src/edwin/calias.scm
index 0e160cc95..2794b94fb 100644
--- a/v7/src/edwin/calias.scm
+++ b/v7/src/edwin/calias.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: calias.scm,v 1.27 2003/01/10 18:50:20 cph Exp $
+$Id: calias.scm,v 1.28 2003/01/10 18:52:09 cph Exp $
 
 Copyright 1986,1989,1991,1992,1994,1995 Massachusetts Institute of Technology
 Copyright 1998,2000,2001,2002,2003 Massachusetts Institute of Technology
@@ -155,7 +155,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 (define (key? object)
   (or (char? object)
       (special-key? object)
-      (button? key)))
+      (button? object)))
 
 (define (key-bucky-bits key)
   (cond ((char? key) (char-bits key))
diff --git a/v7/src/edwin/edtstr.scm b/v7/src/edwin/edtstr.scm
index 887b43c6f..23827687d 100644
--- a/v7/src/edwin/edtstr.scm
+++ b/v7/src/edwin/edtstr.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: edtstr.scm,v 1.26 2003/01/10 18:50:26 cph Exp $
+$Id: edtstr.scm,v 1.27 2003/01/10 18:51:17 cph Exp $
 
 Copyright 1989,1990,1991,1992,2003 Massachusetts Institute of Technology
 
@@ -115,8 +115,8 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 (define-record-type button-record-type
   (%%make-button number down?)
   button?
-  (number button/number)
-  (down? button/down?))
+  ((number button/number)
+   (down? button/down?)))
 
 (define make-down-button)
 (define make-up-button)
-- 
2.25.1