Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324

2 files changed, 3 insertions, 1 deletions

diff --git a/lisp/play/blackbox.el b/lisp/play/blackbox.el
index e54dad675a8..f8ed471beb7 100644
--- a/lisp/play/blackbox.el
+++ b/lisp/play/blackbox.el
@@ -106,7 +106,9 @@
     (blackbox-redefine-key map 'move-end-of-line 'bb-eol)
     (blackbox-redefine-key map 'move-beginning-of-line 'bb-bol)
     (define-key map " " 'bb-romp)
+    (define-key map "q" 'bury-buffer)
     (define-key map [insert] 'bb-romp)
+    (define-key map [return] 'bb-done)
     (blackbox-redefine-key map 'newline 'bb-done)
     map))
 
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index 5f8709d17b7..b4997ce4d57 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -1,6 +1,6 @@
 ;;; bubbles.el --- Puzzle game for Emacs.
 
-;; Copyright (C) 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008  Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; URL:         http://ulf.epplejasper.de/