Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv8015

Modified Files: esa.lisp Log Message: Fix numeric arguments Date: Mon Aug 1 23:42:29 2005 Author: dmurray

Index: climacs/esa.lisp diff -u climacs/esa.lisp:1.11 climacs/esa.lisp:1.12 --- climacs/esa.lisp:1.11 Mon Jul 25 05:41:13 2005 +++ climacs/esa.lisp Mon Aug 1 23:42:28 2005 @@ -105,10 +105,12 @@

(defparameter *current-gesture* nil)

+(defparameter *meta-digit-table* + (loop for i from 0 to 9 + collect (list :keyboard (digit-char i) (make-modifier-state :meta)))) + (defun meta-digit (gesture) - (position gesture - '((#\0 :meta) (#\1 :meta) (#\2 :meta) (#\3 :meta) (#\4 :meta) - (#\5 :meta) (#\6 :meta) (#\7 :meta) (#\8 :meta) (#\9 :meta)) + (position gesture *meta-digit-table* :test #'event-matches-gesture-name-p))

(defun esa-read-gesture () @@ -145,12 +147,12 @@ (let ((gesture (esa-read-gesture))) (cond ((event-matches-gesture-name-p gesture - '(:keyboard #\u (make-modifier-state :control))) + `(:keyboard #\u ,(make-modifier-state :control))) (let ((numarg 4)) (loop for gesture = (esa-read-gesture) while (event-matches-gesture-name-p gesture - '(:keyboard #\u (make-modifier-state :control))) + `(:keyboard #\u ,(make-modifier-state :control))) do (setf numarg (* 4 numarg)) finally (esa-unread-gesture gesture stream)) (let ((gesture (esa-read-gesture)))