[climacs-cvs] CVS update: climacs/esa.lisp

[Christophe Rhodes]

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

Modified Files:
	esa.lisp 
Log Message:
Whoops.  Restore JQS's hack for M-% and friends

Date: Sat Oct 29 00:16:01 2005
Author: crhodes

Index: climacs/esa.lisp
diff -u climacs/esa.lisp:1.20 climacs/esa.lisp:1.21
--- climacs/esa.lisp:1.20	Fri Oct 28 18:22:51 2005
+++ climacs/esa.lisp	Sat Oct 29 00:16:01 2005
@@ -322,7 +322,16 @@
 	    command table :keystroke gesture :errorp nil)
 	   (when (and (listp gesture)
 		      (find :meta gesture))
-	     (set-key command table (list (list :escape) (remove :meta gesture)))))
+             ;; KLUDGE: this is a workaround for poor McCLIM
+             ;; behaviour; really this canonization should happen in
+             ;; McCLIM's input layer.
+	     (set-key command table
+		      (list (list :escape)
+			    (let ((esc-list (remove :meta gesture)))
+			      (if (and (= (length esc-list) 2)
+				       (find :shift esc-list))
+				  (remove :shift esc-list)
+				  esc-list))))))
 	  (t (set-key command
 		      (ensure-subtable table gesture)
 		      (cdr gestures))))))