scheme interaction mode

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

diff --git a/lisp/winner.el b/lisp/winner.el
index 4533305..1e32a7f 100644 (file)
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -1,6 +1,6 @@
 ;;; winner.el --- Restore old window configurations
 
-;; Copyright (C) 1997-1998, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: Ivar Rummelhoff <ivarru@math.uio.no>
 ;; Created: 27 Feb 1997
@@ -45,10 +45,8 @@
                         (if (featurep 'xemacs)
                             `(if ,store (zmacs-activate-region)
                                (zmacs-deactivate-region))
-                          `(setq mark-active ,store)))))
-  (if (boundp 'mark-active)
-      mark-active
-    (region-active-p)))
+                          `(if ,store (activate-mark) (deactivate-mark))))))
+  (region-active-p))
 
 (defalias 'winner-edges
   (if (featurep 'xemacs) 'window-pixel-edges 'window-edges))
@@ -64,7 +62,7 @@
   :group 'windows)
 
 (defcustom winner-dont-bind-my-keys nil
-  "Non-nil means do not use `winner-mode-map' in Winner mode."
+  "Non-nil means do not bind keys in Winner mode."
   :type  'boolean
   :group 'winner)
 
@@ -229,8 +227,7 @@ You may want to include buffer names such as *Help*, *Apropos*,
       (set-window-configuration winconf))
     (cond
      ((window-live-p chosen) (select-window chosen))
-     ((window-minibuffer-p (selected-window))
-      (other-window 1)))
+     ((window-minibuffer-p) (other-window 1)))
     (when (/= minisize (window-height miniwin))
       (with-selected-window miniwin
         (setf (window-height) minisize)))))
@@ -338,36 +335,24 @@ You may want to include buffer names such as *Help*, *Apropos*,
 
 (defvar winner-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map [(control c) left] 'winner-undo)
-    (define-key map [(control c) right] 'winner-redo)
+    (unless winner-dont-bind-my-keys
+      (define-key map [(control c) left] 'winner-undo)
+      (define-key map [(control c) right] 'winner-redo))
     map)
   "Keymap for Winner mode.")
 
-;; Check if `window-configuration-change-hook' is working.
-(defun winner-hook-installed-p ()
-  (save-window-excursion
-    (let ((winner-var nil)
-         (window-configuration-change-hook
-          '((lambda () (setq winner-var t)))))
-      (split-window)
-      winner-var)))
-
 \f
 ;;;###autoload
 (define-minor-mode winner-mode nil :global t ; let d-m-m make the doc
   (if winner-mode
       (progn
-        (if (winner-hook-installed-p)
-            (progn
-              (add-hook 'window-configuration-change-hook 'winner-change-fun)
-              (add-hook 'post-command-hook 'winner-save-old-configurations))
-          (add-hook 'post-command-hook 'winner-save-conditionally))
+        (add-hook 'window-configuration-change-hook 'winner-change-fun)
+        (add-hook 'post-command-hook 'winner-save-old-configurations)
         (add-hook 'minibuffer-setup-hook 'winner-save-unconditionally)
         (setq winner-modified-list (frame-list))
         (winner-save-old-configurations))
     (remove-hook 'window-configuration-change-hook 'winner-change-fun)
     (remove-hook 'post-command-hook 'winner-save-old-configurations)
-    (remove-hook 'post-command-hook 'winner-save-conditionally)
     (remove-hook 'minibuffer-setup-hook 'winner-save-unconditionally)))
 
 ;; Inspired by undo (simple.el)
@@ -395,7 +380,7 @@ In other words, \"undo\" changes in window configuration."
        (setq winner-undone-data (list (winner-win-data))))
       (cl-incf winner-undo-counter)    ; starting at 1
       (when (and (winner-undo-this)
-                (not (window-minibuffer-p (selected-window))))
+                (not (window-minibuffer-p)))
        (message "Winner undo (%d / %d)"
                 winner-undo-counter
                 (1- (ring-length winner-pending-undo-ring)))))))
@@ -435,12 +420,5 @@ In other words, \"undo\" changes in window configuration."
       (message "Winner undid undo")))
    (t (error "Previous command was not a `winner-undo'"))))
 
-;;; To be evaluated when the package is loaded:
-
-(unless (or (assq 'winner-mode minor-mode-map-alist)
-           winner-dont-bind-my-keys)
-  (push (cons 'winner-mode winner-mode-map)
-       minor-mode-map-alist))
-
 (provide 'winner)
 ;;; winner.el ends here