aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-03-12 16:45:29 +0000
committerGerd Moellmann2001-03-12 16:45:29 +0000
commitb0778a3197ea5513f3cef2e1cd085a5230354ce4 (patch)
tree38e215ad5b3e5beeb2f0fa87251cac3c8f99ff80
parent04528cda8169911f5723263bbf2672c8170bfbe6 (diff)
downloademacs-b0778a3197ea5513f3cef2e1cd085a5230354ce4.tar.gz
emacs-b0778a3197ea5513f3cef2e1cd085a5230354ce4.zip
(life): Rearrange code so that all calls to
life-display-generation are in a catch-form.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/play/life.el7
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 21dde7721d5..f809c8b4f0b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12001-03-12 Gerd Moellmann <gerd@gnu.org> 12001-03-12 Gerd Moellmann <gerd@gnu.org>
2 2
3 * play/life.el (life): Rearrange code so that all calls to
4 life-display-generation are in a catch-form.
5
3 * progmodes/etags.el (tags-loop-continue): Don't change point in a 6 * progmodes/etags.el (tags-loop-continue): Don't change point in a
4 file that isn't interesting. In an interesting file, push the old 7 file that isn't interesting. In an interesting file, push the old
5 value of point on the mark ring. 8 value of point on the mark ring.
diff --git a/lisp/play/life.el b/lisp/play/life.el
index 5764224d1d1..5442595dcc1 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -1,6 +1,6 @@
1;;; life.el --- John Horton Conway's `Life' game for GNU Emacs 1;;; life.el --- John Horton Conway's `Life' game for GNU Emacs
2 2
3;; Copyright (C) 1988 Free Software Foundation, Inc. 3;; Copyright (C) 1988, 2001 Free Software Foundation, Inc.
4 4
5;; Author: Kyle Jones <kyleuunet.uu.net> 5;; Author: Kyle Jones <kyleuunet.uu.net>
6;; Keywords: games 6;; Keywords: games
@@ -106,14 +106,13 @@ generations (this defaults to 1)."
106 (setq life-initialized t) 106 (setq life-initialized t)
107 (or sleeptime (setq sleeptime 1)) 107 (or sleeptime (setq sleeptime 1))
108 (life-setup) 108 (life-setup)
109 (life-display-generation sleeptime)
110 (catch 'life-exit 109 (catch 'life-exit
111 (while t 110 (while t
112 (let ((inhibit-quit t)) 111 (let ((inhibit-quit t))
112 (life-display-generation sleeptime)
113 (life-grim-reaper) 113 (life-grim-reaper)
114 (life-expand-plane-if-needed) 114 (life-expand-plane-if-needed)
115 (life-increment-generation) 115 (life-increment-generation)))))
116 (life-display-generation sleeptime)))))
117 116
118(defalias 'life-mode 'life) 117(defalias 'life-mode 'life)
119(put 'life-mode 'mode-class 'special) 118(put 'life-mode 'mode-class 'special)