Add 2012 to FSF copyright years for Emacs files

[bpt/emacs.git] / lisp / winner.el

diff --git a/lisp/winner.el b/lisp/winner.el
index ed840d3..55f8264 100644 (file)
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -1,7 +1,6 @@
 ;;; winner.el --- Restore old window configurations
 
-;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation. Inc.
+;; Copyright (C) 1997-1998, 2001-2012 Free Software Foundation. Inc.
 
 ;; Author: Ivar Rummelhoff <ivarru@math.uio.no>
 ;; Created: 27 Feb 1997
@@ -9,10 +8,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -46,12 +43,12 @@
 
 
 (defmacro winner-active-region ()
-  (if (fboundp 'region-active-p)
-      '(region-active-p)
-    'mark-active))
+  (if (boundp 'mark-active)
+      'mark-active
+    '(region-active-p)))
 
 (defsetf winner-active-region () (store)
-  (if (fboundp 'zmacs-activate-region)
+  (if (featurep 'xemacs)
       `(if ,store (zmacs-activate-region)
         (zmacs-deactivate-region))
     `(setq mark-active ,store)))
@@ -65,17 +62,10 @@
 
 (require 'ring)
 
-(unless (fboundp 'defgroup)
-  (defmacro defgroup (&rest rest)))
-
 (defgroup winner nil
   "Restoring window configurations."
   :group 'windows)
 
-(unless (fboundp 'defcustom)
-  (defmacro defcustom (symbol &optional initvalue docs &rest rest)
-    (list 'defvar symbol initvalue docs)))
-
 ;;;###autoload
 (defcustom winner-mode nil
   "Toggle Winner mode.
@@ -155,7 +145,7 @@ You may want to include buffer names such as *Help*, *Apropos*,
 
 ;;; Saved configurations
 
-;; This variable contains the window cofiguration rings.
+;; This variable contains the window configuration rings.
 ;; The key in this alist is the frame.
 (defvar winner-ring-alist nil)
 
@@ -396,7 +386,8 @@ With arg, turn Winner mode on if and only if arg is positive."
       (setq winner-modified-list (frame-list))
       (winner-save-old-configurations)
       (run-hooks 'winner-mode-hook)
-      (when (interactive-p) (message "Winner mode enabled")))
+      (when (called-interactively-p 'interactive)
+       (message "Winner mode enabled")))
      ;; Turn mode off
      (winner-mode
       (setq winner-mode nil)
@@ -405,7 +396,8 @@ With arg, turn Winner mode on if and only if arg is positive."
       (remove-hook 'post-command-hook 'winner-save-conditionally)
       (remove-hook 'minibuffer-setup-hook 'winner-save-unconditionally)
       (run-hooks 'winner-mode-leave-hook)
-      (when (interactive-p) (message "Winner mode disabled"))))))
+      (when (called-interactively-p 'interactive)
+       (message "Winner mode disabled"))))))
 
 ;; Inspired by undo (simple.el)
 
@@ -480,5 +472,4 @@ In other words, \"undo\" changes in window configuration."
        minor-mode-map-alist))
 
 (provide 'winner)
-;; arch-tag: 686d1c1b-010e-42ca-a192-b5685112418f
 ;;; winner.el ends here