--- a/lisp/prim/cmdloop.el	Mon Aug 13 10:02:48 2007 +0200
+++ b/lisp/prim/cmdloop.el	Mon Aug 13 10:03:52 2007 +0200
@@ -88,10 +88,14 @@
 	 nil)
 	((region-active-p)
 	 (zmacs-deactivate-region))
+	((> (recursion-depth) 0)
+	 (exit-recursive-edit))
 	(buffer-quit-function
 	 (funcall buffer-quit-function))
 	((not (one-window-p t))
-	 (delete-other-windows))))
+	 (delete-other-windows))
+	((string-match "^ \\*" (buffer-name (current-buffer)))
+	 (bury-buffer))))
 
 ;;#### This should really be a ring of last errors.
 (defvar last-error nil