diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2001-07-09 12:14:45 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2001-07-09 12:14:45 +0000 |
| commit | 59c2dcf474bc74a2b9b57e5145b30228173075f1 (patch) | |
| tree | d21b60a81036916056d48739eff8fd17ce8e19a7 | |
| parent | 06c66e1c8680da1ae42c16bd454caee7942e18ac (diff) | |
| download | emacs-59c2dcf474bc74a2b9b57e5145b30228173075f1.tar.gz | |
(winner-equal): Make it a defun. Don't compare Winner
configurations with compare-window-configuration; they aren't
window configurations.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/winner.el | 16 |
2 files changed, 15 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d1dc4927858..8a2c30391ee 100644 --- 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 2e359959434..3443fcb0a9f 100644 --- 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." ;;; 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) |