(winner-equal): Make it a defun. Don't compare Winner

configurations with compare-window-configuration; they aren't
window configurations.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1dc492785872b014c79f0b8bb4bff5c4af7b7c4..8a2c30391ee685de317c4a677c427db0b24fab09 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2001-07-09  Gerd Moellmann  <gerd@gnu.org>
 
+       * winner.el (winner-equal): Make it a defun.  Don't compare Winner
+       configurations with compare-window-configuration; they aren't
+       window configurations.
+
        * net/ange-ftp.el (ange-ftp-file-modtime): Check a 213 response
        from the server for the format we expect.  Don't use it if it
        doesn't look like what the Internet draft for FTP extensions

diff --git a/lisp/winner.el b/lisp/winner.el
index 2e359959434884512906a854c30d633521813565..3443fcb0a9fa098aa1ac1dbd3b95b72bdbe99d80 100644 (file)
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -1,6 +1,6 @@
 ;;; winner.el --- Restore old window configurations
 
-;; Copyright (C) 1997, 1998 Free Software Foundation. Inc.
+;; Copyright (C) 1997, 1998, 2001 Free Software Foundation. Inc.
 
 ;; Author: Ivar Rummelhoff <ivarru@math.uio.no>
 ;; Created: 27 Feb 1997
@@ -145,6 +145,16 @@ use either \\[customize] or the function `winner-mode'."
 ;; Frames affected by the previous command.
 (defvar winner-last-frames nil)
 
+
+(defun winner-equal (a b)
+  "Check two Winner configurations A and B for equality.
+Winner configurations are of the form (CONFIG BUFFERS),
+where CONFIG is a window configuration and BUFFERS is a list of
+buffers."
+  (and (compare-window-configurations (car a) (car b))
+       (equal (cdr a) (cdr b))))
+
+
 ;; Save the current window configuration, if it has changed.
 ;; Then return frame, else return nil.
 (defun winner-insert-if-new (frame)
@@ -427,10 +437,6 @@ In other words, \"undo\" changes in window configuration."
 \f
 ;;; To be evaluated when the package is loaded:
 
-(if (fboundp 'compare-window-configurations)
-    (defalias 'winner-equal 'compare-window-configurations)
-  (defalias 'winner-equal 'equal))
-
 (unless winner-mode-map
   (setq winner-mode-map (make-sparse-keymap))
   (define-key winner-mode-map [(control x) left] 'winner-undo)