(life): Rearrange code so that all calls to

life-display-generation are in a catch-form.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 21dde7721d534930d4a9e96cc1363a64160d0308..f809c8b4f0b7033f9c7d0c9e46ae1d4dd98dc56e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-12  Gerd Moellmann  <gerd@gnu.org>
 
+       * play/life.el (life): Rearrange code so that all calls to
+       life-display-generation are in a catch-form.
+
        * progmodes/etags.el (tags-loop-continue): Don't change point in a
        file that isn't interesting.  In an interesting file, push the old
        value of point on the mark ring.

diff --git a/lisp/play/life.el b/lisp/play/life.el
index 5764224d1d1d6828ccaa428100246c121699e234..5442595dcc131e4ff7bc05139284c79e82bf1567 100644 (file)
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -1,6 +1,6 @@
 ;;; life.el --- John Horton Conway's `Life' game for GNU Emacs
 
-;; Copyright (C) 1988 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2001 Free Software Foundation, Inc.
 
 ;; Author: Kyle Jones <kyleuunet.uu.net>
 ;; Keywords: games
@@ -106,14 +106,13 @@ generations (this defaults to 1)."
   (setq life-initialized t)
   (or sleeptime (setq sleeptime 1))
   (life-setup)
-  (life-display-generation sleeptime)
   (catch 'life-exit
     (while t
       (let ((inhibit-quit t))
+       (life-display-generation sleeptime)
        (life-grim-reaper)
        (life-expand-plane-if-needed)
-       (life-increment-generation)
-       (life-display-generation sleeptime)))))
+       (life-increment-generation)))))
 
 (defalias 'life-mode 'life)
 (put 'life-mode 'mode-class 'special)