*** no comment ***

4 files changed, 63 insertions, 63 deletions

diff --git a/TODO b/TODO
index 29c2770..51ca7a9 100644
--- a/TODO
+++ b/TODO
@@ -27,8 +27,6 @@ laptop.
 
 ----------------------------------------------------------------------
 
-- undo is not working with gnuchess
-
 - test making an en passant capture
 
 - the game should go inactive once I lose by stalemate/checkmate
diff --git a/chess-common.el b/chess-common.el
index 9e05c96..66a4b99 100644
--- a/chess-common.el
+++ b/chess-common.el
@@ -64,7 +64,10 @@
       (chess-engine-send nil "undo\n"))
     (if (= 1 (mod (car args) 2))
 	(chess-engine-send nil "go\n"))
-    (chess-game-undo chess-engine-game (car args)))
+
+    ;; prevent use from handling the `undo' event which this triggers
+    (let ((chess-engine-handling-event t))
+      (chess-game-undo chess-engine-game (car args))))
 
    ((eq event 'move)
     (chess-engine-send nil (concat (chess-ply-to-algebraic (car args))
diff --git a/chess-display.el b/chess-display.el
index 7cd5bd3..ca75eeb 100644
--- a/chess-display.el
+++ b/chess-display.el
@@ -326,15 +326,12 @@ See `chess-display-type' for the different kinds of displays."
 	(chess-display-set-perspective* nil (not my-color))))
 
      ((eq event 'orient)
-      ;; Set the display's perspective to whichever color I'm
-      ;; playing
-      (chess-display-set-perspective*
-       nil (chess-game-data game 'my-color))))
-
-    (if (memq event '(orient update setup-game move resign))
-	(chess-display-set-index* nil (chess-game-index game)))
+      ;; Set the display's perspective to whichever color I'm playing
+      (chess-display-set-perspective* nil (chess-game-data game 'my-color))))
 
     (let ((momentous (memq event chess-display-momentous-events)))
+      (if momentous
+	  (chess-display-set-index* nil (chess-game-index game)))
       (if (or momentous (memq event chess-display-interesting-events))
 	  (chess-display-update nil momentous)))))
 
@@ -807,26 +804,38 @@ to the end or beginning."
 (make-variable-buffer-local 'chess-legal-moves-pos)
 (make-variable-buffer-local 'chess-legal-moves)
 
+(defun chess-display-assert-can-move ()
+  (if (and (chess-display-active-p)
+	   ;; `active' means we're playing against an engine
+	   (chess-game-data chess-display-game 'active)
+	   (not (eq (chess-game-data chess-display-game 'my-color)
+		    (chess-pos-side-to-move position))))
+      (error "It is not your turn to move")
+    (if (and (= chess-display-index
+		(chess-game-index chess-display-game))
+	     (chess-game-over-p chess-display-game))
+	(error "This game is over"))))
+
 (defun chess-keyboard-test-move (move-ply)
   "Return the given MOVE if it matches the user's current input."
-  (let* ((move (cdr move-ply)) (i 0) (x 0)
-	 (l (length move))
+  (let* ((move (cdr move-ply))
+	 (i 0) (x 0) (l (length move))
 	 (xl (length chess-move-string))
 	 (match t))
     (unless (or (and (equal (downcase chess-move-string) "ok")
-		     (equal move "O-O"))
+		     (string-match "\\`O-O[+#]\\'" move))
 		(and (equal (downcase chess-move-string) "oq")
-		     (equal move "O-O-O")))
+		     (string-match "\\`O-O-O[+#]\\'" move)))
       (while (and (< i l) (< x xl))
 	(let ((move-char (aref move i))
 	      (entry-char (aref chess-move-string x)))
 	  (if (= move-char ?x)
-	      (setq i (1+ i)))
-	  (if (/= entry-char (if (< entry-char ?a)
-				 move-char
-			       (downcase move-char)))
-	      (setq match nil i l)
-	    (setq i (1+ i) x (1+ x))))))
+	      (setq i (1+ i))
+	    (if (/= entry-char (if (< entry-char ?a)
+				   move-char
+				 (downcase move-char)))
+		(setq match nil i l)
+	      (setq i (1+ i) x (1+ x)))))))
     (if match
 	move-ply)))
 
@@ -851,13 +860,9 @@ to the end or beginning."
 (defun chess-keyboard-shortcut (&optional display-only)
   (interactive)
   (let* ((position (chess-display-position nil))
-	 (color (chess-pos-side-to-move position)))
-    (if (and (chess-display-active-p)
-	     ;; `active' means we're playing against an engine
-	     (chess-game-data chess-display-game 'active)
-	     (not (eq (chess-game-data chess-display-game 'my-color)
-		      (chess-pos-side-to-move position))))
-	(error "It is not your turn to move"))
+	 (color (chess-pos-side-to-move position))
+	 char)
+    (chess-display-assert-can-move)
     (unless (memq last-command '(chess-keyboard-shortcut
 				 chess-keyboard-shortcut-delete))
       (setq chess-move-string nil))
@@ -868,30 +873,32 @@ to the end or beginning."
 		 (eq position chess-legal-moves-pos)
 		 (or (> (length chess-move-string) 1)
 		     (eq (car chess-legal-moves) last-command-char)))
-      (setq chess-legal-moves-pos position
+      (setq char last-command-char
+	    chess-legal-moves-pos position
 	    chess-legal-moves
-	    (cons last-command-char
-		  (sort (mapcar
-			 (function
-			  (lambda (ply)
-			    (cons ply (chess-ply-to-algebraic ply))))
-			 (if (eq last-command-char ?b)
-			     (append (chess-legal-plies position
-							(if color ?P ?p) 1)
-				     (chess-legal-plies position
-							(if color ?B ?b)))
-			   (if (and (>= last-command-char ?a)
-				    (<= last-command-char ?h))
-			       (chess-legal-plies position (if color ?P ?p)
-						  (- last-command-char ?a))
-			     (chess-legal-plies
-			      position
-			      (if color
-				  (upcase last-command-char)
-				(downcase last-command-char))))))
-			(function
-			 (lambda (left right)
-			   (string-lessp (cdr left) (cdr right)))))))))
+	    (cons char
+		  (sort
+		   (mapcar
+		    (function
+		     (lambda (ply)
+		       (cons ply (chess-ply-to-algebraic ply))))
+		    (if (eq char ?b)
+			(append (chess-legal-plies
+				 position :piece (if color ?P ?p) :file 1)
+				(chess-legal-plies
+				 position :piece (if color ?B ?b)))
+		      (if (and (>= char ?a)
+			       (<= char ?h))
+			  (chess-legal-plies position
+					     :piece (if color ?P ?p)
+					     :file (- char ?a))
+			(chess-legal-plies position
+					   :piece (if color
+						      (upcase char)
+						    (downcase char))))))
+		   (function
+		    (lambda (left right)
+		      (string-lessp (cdr left) (cdr right)))))))))
   (let ((moves (delq nil (mapcar 'chess-keyboard-test-move
 				 (cdr chess-legal-moves)))))
     (cond
@@ -948,19 +955,9 @@ Clicking once on a piece selects it; then click on the target location."
 		      (error "That is not a legal move"))
 		    (chess-display-move nil ply)))
 		(setq chess-display-last-selected nil))
+	    (chess-display-assert-can-move)
 	    (let ((piece (chess-pos-piece position coord)))
 	      (cond
-	       ((and (chess-display-active-p)
-		     ;; `active' means we're playing an engine
-		     (chess-game-data chess-display-game 'active)
-		     (not (eq (chess-game-data chess-display-game
-					       'my-color)
-			      (chess-pos-side-to-move position))))
-		(error "It is not your turn to move"))
-	       ((and (= chess-display-index
-			(chess-game-index chess-display-game))
-		     (chess-game-over-p chess-display-game))
-		(error "This game is over"))
 	       ((eq piece ? )
 		(error "You cannot select an empty square"))
 	       ((if (chess-pos-side-to-move position)
diff --git a/chess-game.el b/chess-game.el
index 3214eb2..25d089d 100644
--- a/chess-game.el
+++ b/chess-game.el
@@ -166,8 +166,10 @@ matches."
 (defun chess-game-undo (game count)
   "Undo the last COUNT plies of GAME."
   (if (> count (chess-game-index game))
-      (error "Cannot undo further")
-    (chess-game-set-plies game (nbutlast (chess-game-plies game) count))))
+      (error "Cannot undo further"))
+  (let ((chess-game-inhibit-events t))
+    (chess-game-set-plies game (nbutlast (chess-game-plies game) count)))
+  (chess-game-run-hooks game 'update))
 
 
 (defsubst chess-game-over-p (game)