* lisp/winner.el (winner-mode-map): Obey winner-dont-bind-my-keys here.

(minor-mode-map-alist): Remove redundant code.

2 files changed, 7 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 093c87eba70..7e41ddc2ad1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-09-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * winner.el (winner-mode-map): Obey winner-dont-bind-my-keys here.
+        (minor-mode-map-alist): Remove redundant code.
+
         * vc/pcvs.el (cvs-cleanup-collection): Keep entries that are currently
         visited in a buffer.
         (cvs-insert-visited-file): New function.
diff --git a/lisp/winner.el b/lisp/winner.el
index 453330598b6..65b3d30a80c 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -64,7 +64,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)
 
@@ -338,8 +338,9 @@ 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.")
 
@@ -435,12 +436,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