Merge from emacs--rel--22

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

diff --git a/lisp/play/snake.el b/lisp/play/snake.el
index 2367705a68f5a6ce336de34232986d2863f204a0..3b66782f3aa2e7ccba4bb1446528020c1ec1994f 100644 (file)
--- a/lisp/play/snake.el
+++ b/lisp/play/snake.el
@@ -1,6 +1,7 @@
 ;;; snake.el --- implementation of Snake for Emacs
 
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Glynn Clements <glynn@sensei.co.uk>
 ;; Created: 1997-09-10
@@ -10,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -20,8 +21,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:
 
@@ -82,7 +83,10 @@
 (defvar snake-score-y snake-height
   "Y position of score.")
 
-(defvar snake-score-file (concat temporary-file-directory "snake-scores")
+;; It is not safe to put this in /tmp.
+;; Someone could make a symlink in /tmp
+;; pointing to a file you don't want to clobber.
+(defvar snake-score-file "snake-scores"
   "File for holding high scores.")
 
 ;; ;;;;;;;;;;;;; display options ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -120,7 +124,8 @@
   '(((glyph colorize)
      (t ?\+))
     ((color-x color-x)
-     (mono-x grid-x))
+     (mono-x grid-x)
+     (color-tty color-tty))
     (((glyph color-x) [0.5 0.5 0.5])
      (color-tty "white"))))
 
@@ -366,22 +371,23 @@ Snake mode keybindings:
   (setq major-mode 'snake-mode)
   (setq mode-name "Snake")
 
-  (setq mode-popup-menu
-       '("Snake Commands"
-         ["Start new game"     snake-start-game]
-         ["End game"           snake-end-game
-          (snake-active-p)]
-         ["Pause"              snake-pause-game
-          (and (snake-active-p) (not snake-paused))]
-         ["Resume"             snake-pause-game
-          (and (snake-active-p) snake-paused)]))
+  (unless (featurep 'emacs)
+    (setq mode-popup-menu
+         '("Snake Commands"
+           ["Start new game"   snake-start-game]
+           ["End game"         snake-end-game
+            (snake-active-p)]
+           ["Pause"            snake-pause-game
+            (and (snake-active-p) (not snake-paused))]
+           ["Resume"           snake-pause-game
+            (and (snake-active-p) snake-paused)])))
 
   (setq gamegrid-use-glyphs snake-use-glyphs-flag)
   (setq gamegrid-use-color snake-use-color-flag)
 
   (gamegrid-init (snake-display-options))
 
-  (run-hooks 'snake-mode-hook))
+  (run-mode-hooks 'snake-mode-hook))
 
 ;;;###autoload
 (defun snake ()
@@ -408,4 +414,5 @@ Snake mode keybindings:
 
 (provide 'snake)
 
+;;; arch-tag: 512ffc92-cfac-4287-9a4e-92890701a5c8
 ;;; snake.el ends here