Merge from gnus--rel--5.10

[gnu-emacs] / lisp / play / tetris.el

diff --git a/lisp/play/tetris.el b/lisp/play/tetris.el
index 045534c2cea89fa89926e14c7dc54423e26a3f16..53305a08e66b1e257ae09229be75066dd9da2006 100644 (file)
--- a/lisp/play/tetris.el
+++ b/lisp/play/tetris.el
@@ -1,6 +1,7 @@
 ;;; tetris.el --- implementation of Tetris for Emacs
 
-;; Copyright (C) 1997, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Glynn Clements <glynn@sensei.co.uk>
 ;; Version: 2.01
@@ -21,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -361,9 +362,9 @@ Element 0 is ignored."
   (setq tetris-pos-y 0)
   (if (tetris-test-shape)
       (tetris-end-game)
-    (tetris-draw-shape))
-  (tetris-draw-next-shape)
-  (tetris-update-score))
+    (tetris-draw-shape)
+    (tetris-draw-next-shape)
+    (tetris-update-score)))
 
 (defun tetris-draw-next-shape ()
   (loop for y from 0 to 3 do
@@ -601,22 +602,23 @@ tetris-mode keybindings:
   (setq major-mode 'tetris-mode)
   (setq mode-name "Tetris")
 
-  (setq mode-popup-menu
-       '("Tetris Commands"
-         ["Start new game"     tetris-start-game]
-         ["End game"           tetris-end-game
-          (tetris-active-p)]
-         ["Pause"              tetris-pause-game
-          (and (tetris-active-p) (not tetris-paused))]
-         ["Resume"             tetris-pause-game
-          (and (tetris-active-p) tetris-paused)]))
+  (unless (featurep 'emacs)
+    (setq mode-popup-menu
+         '("Tetris Commands"
+           ["Start new game"   tetris-start-game]
+           ["End game"         tetris-end-game
+            (tetris-active-p)]
+           ["Pause"            tetris-pause-game
+            (and (tetris-active-p) (not tetris-paused))]
+           ["Resume"           tetris-pause-game
+            (and (tetris-active-p) tetris-paused)])))
 
   (setq gamegrid-use-glyphs tetris-use-glyphs)
   (setq gamegrid-use-color tetris-use-color)
 
   (gamegrid-init (tetris-display-options))
 
-  (run-hooks 'tetris-mode-hook))
+  (run-mode-hooks 'tetris-mode-hook))
 
 ;;;###autoload
 (defun tetris ()