boxer-sunrise-42 Fixing editor-abort-char? and test cases

boxer-project · Jan 28, 2022 · 06c72c1 · 06c72c1
1 parent 6e3b96c
commit 06c72c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/src/editor-high/comdef.lisp b/src/editor-high/comdef.lisp
@@ -735,18 +735,11 @@ Modification History (most recent at top)
 ;  (reset-mouse-cursor)
 ;  (setq *suitcase-mode* nil))
 
-(defvar *editor-abort-chars* #\c) ; sgithens TODO March 7, 2020
-  ;; #-mcl (list (make-char #\g 1) (make-char #\. 1)
-  ;;             ;; 200. is the STOP key on Suns
-  ;;             #+sun (make-char (code-char 200))
-  ;;             #+sun (make-char (code-char 200) 1))
-  ;; ;; MCL can't encode shift bits in character objects
-  ;; #+mcl (list #\Bell))
-
-(defun editor-abort-char? (char &optional bits)
-  (declare (ignore bits))
-  (and (characterp char)
-       (or (member char *editor-abort-chars* :test #'char-equal))))
+(defvar *editor-abort-chars* '((#\g 2) (#\. 2)))
+
+(defun editor-abort-char? (ch &optional (bits 0))
+  (let ((keystroke (list ch bits)))
+    (if (member keystroke *editor-abort-chars* :test #'equal) t nil)))
 
 ;; used in keydef-high
 (defvar *defined-input-device-platforms* nil

diff --git a/tests/comdef-tests.lisp b/tests/comdef-tests.lisp
@@ -12,9 +12,11 @@
 
 (is (boxer::editor-abort-char? #\c 1) nil)
 
-(is (boxer::editor-abort-char? #\g 1) t)
+(is (boxer::editor-abort-char? #\c 2) nil)
 
-(is (boxer::editor-abort-char? #\. 1) t)
+(is (boxer::editor-abort-char? #\g 2) t)
+
+(is (boxer::editor-abort-char? #\. 2) t)
 
 
 (finalize)