Don't require cl when compiling.

(byte-compile-warnings): Set via file local variables.
(dun-parse): Let-bind `beg' and `line'.

2 files changed, 17 insertions, 18 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 40b2fafc42f..ee796b3e0a5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -31,6 +31,10 @@
         (bbdb-address-location, bbdb-record-addresses): Pass non-nil
         fourth arg to declare-function.
 
+        * play/dunnet.el: Don't require cl when compiling.
+        (byte-compile-warnings): Set via file local variables.
+        (dun-parse): Let-bind `beg' and `line'.
+
 2007-11-29  Alexandre Julliard  <julliard@winehq.org>
 
         * vc-git.el (vc-git-dir-state): Fix the git command arguments.
diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el
index a1f8c2708d2..95c16849dce 100644
--- a/lisp/play/dunnet.el
+++ b/lisp/play/dunnet.el
@@ -1,4 +1,4 @@
-;;; dunnet.el --- text adventure for Emacs
+;;; dunnet.el --- text adventure for Emacs -*-  byte-compile-warnings: nil -*-
 
 ;; Copyright (C) 1992, 1993, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007 Free Software Foundation, Inc.
@@ -46,12 +46,6 @@
   :type 'file
   :group 'dunnet)
 
-(if nil
-    (eval-and-compile (setq byte-compile-warnings nil)))
-
-(eval-when-compile
- (require 'cl))
-
 ;;;; Mode definitions for interactive mode
 
 (define-derived-mode dun-mode text-mode "Dungeon"
@@ -63,18 +57,19 @@
   "Function called when return is pressed in interactive mode to parse line."
   (interactive "*p")
   (beginning-of-line)
-  (setq beg (+ (point) 1))
-  (end-of-line)
-  (if (and (not (= beg (point))) (not (< (point) beg))
-           (string= ">" (buffer-substring (- beg 1) beg)))
-      (progn
-        (setq line (downcase (buffer-substring beg (point))))
-        (princ line)
-        (if (eq (dun-vparse dun-ignore dun-verblist line) -1)
-            (dun-mprinc "I don't understand that.\n")))
+  (let ((beg (1+ (point)))
+        line)
+    (end-of-line)
+    (if (and (not (= beg (point))) (not (< (point) beg))
+             (string= ">" (buffer-substring (- beg 1) beg)))
+        (progn
+          (setq line (downcase (buffer-substring beg (point))))
+          (princ line)
+          (if (eq (dun-vparse dun-ignore dun-verblist line) -1)
+              (dun-mprinc "I don't understand that.\n")))
     (goto-char (point-max))
-    (dun-mprinc "\n"))
-    (dun-messages))
+    (dun-mprinc "\n")))
+  (dun-messages))
 
 (defun dun-messages ()
   (if dun-dead