2 files changed, 12 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dfbf32ad455..5a880cdb977 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-07  Dave Love  <fx@gnu.org>
+
+        * winner.el: Fix keywords, autoload cookies.  Split
+        eval-when-compile form to avoid compilation failure.
+
 2000-03-07  Miyashita Hisashi  <himi@bird.scphys.kyoto-u.ac.jp>
 
         * international/mule.el: Modify comment about coding system
diff --git a/lisp/winner.el b/lisp/winner.el
index 4852e2992e5..d3aa40b2bf3 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Ivar Rummelhoff <ivarr@ifi.uio.no>
 ;; Created: 27 Feb 1997
 ;; Time-stamp: <1998-08-21 19:51:02 ivarr>
-;; Keywords: windows
+;; Keywords: convenience frames
 
 ;; This file is part of GNU Emacs.
 
@@ -42,8 +42,9 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)
+  (require 'cl))
 
+(eval-when-compile
   (cond
    ((eq (aref (emacs-version) 0) ?X)
     (defmacro winner-active-region ()
@@ -67,7 +68,8 @@
   (defmacro defcustom (symbol &optional initvalue docs &rest rest)
     (list 'defvar symbol initvalue docs)))
 
-;;;###autoload
+
+;;;###autoload
 (defcustom winner-mode nil
   "Toggle winner-mode.
 Setting this variable directly does not take effect;
@@ -326,7 +328,8 @@ use either \\[customize] or the function `winner-mode'."
       (split-window)
       winner-var)))
 
-;;;###autoload
+
+;;;###autoload
 (defun winner-mode (&optional arg)
   "Toggle Winner mode.
 With arg, turn Winner mode on if and only if arg is positive."