=== modified file 'lisp/play/5x5.el'
--- lisp/play/5x5.el	2011-05-23 14:46:41 +0000
+++ lisp/play/5x5.el	2011-05-24 04:53:57 +0000
@@ -239,7 +239,8 @@
     (setq 5x5-x-pos (/ 5x5-grid-size 2)
           5x5-y-pos (/ 5x5-grid-size 2)
           5x5-moves 0
-          5x5-grid  (5x5-make-move (5x5-make-new-grid) 5x5-y-pos 5x5-x-pos))
+          5x5-grid  (5x5-make-move (5x5-make-new-grid) 5x5-y-pos 5x5-x-pos)
+	  5x5-solver-output nil)
     (5x5-draw-grid (list 5x5-grid))
     (5x5-position-cursor)))
 
@@ -515,8 +516,8 @@
 	    (with-current-buffer 5x5-log-buffer
 	      (insert name ?= value-to-log ?\n))))
 	value))
-  (defmacro 5x5-log-init ())
-  (defmacro 5x5-log (name value) value))
+  (defsubst 5x5-log-init ())
+  (defsubst 5x5-log (name value) value))
 
 (defun 5x5-solver (grid)
   "Return a list of solutions for GRID.
@@ -843,7 +844,8 @@
     (setq 5x5-x-pos (/ 5x5-grid-size 2)
           5x5-y-pos (/ 5x5-grid-size 2)
           5x5-moves 0
-          5x5-grid  (5x5-make-random-grid (symbol-function '5x5-make-move)))
+          5x5-grid  (5x5-make-random-grid (symbol-function '5x5-make-move))
+	  5x5-solver-output nil)
     (unless 5x5-cracking
       (5x5-draw-grid (list 5x5-grid)))
     (5x5-position-cursor)))