Index: /trunk/ccl/hemlock/src/echo.lisp
===================================================================
--- /trunk/ccl/hemlock/src/echo.lisp	(revision 668)
+++ /trunk/ccl/hemlock/src/echo.lisp	(revision 669)
@@ -109,6 +109,11 @@
   "You guessed it."
   (maybe-wait)
-  (delete-region *echo-area-region*)
-  (setf (buffer-modified *echo-area-buffer*) nil))
+  (let* ((b (current-buffer)))
+    (unwind-protect
+	 (progn
+	   (setf (current-buffer) *echo-area-buffer*)
+	   (delete-region *echo-area-region*)
+	   (setf (buffer-modified *echo-area-buffer*) nil))
+      (setf (current-buffer) b))))
 
 ;;; Message  --  Public