Order predicates for keys must also handle buttons. Otherwise, the

code that sorts key bindings will break.

diff --git a/v7/src/edwin/calias.scm b/v7/src/edwin/calias.scm
index 0e160cc9577f1b2c3de06e9d04f1cf4912c307ef..2794b94fb96fd4d869dfa9c3a6463525edb56fd4 100644 (file)
--- 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 887b43c6f18d5d4b0822fa8a33cd45d203e8038b..23827687df3cf16f5a6880607af51cbdf79c3b5f 100644 (file)
--- 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)