[Emacs-diffs] /srv/bzr/emacs/trunk r110268: * lisp/winner.el (winner-mode-map): Obey winner-dont-bind-my-keys here.

[Stefan Monnier]

------------------------------------------------------------
revno: 110268
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-30 00:00:46 -0400
message:
  * lisp/winner.el (winner-mode-map): Obey winner-dont-bind-my-keys here.
  (minor-mode-map-alist): Remove redundant code.
modified:
  lisp/ChangeLog
  lisp/winner.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-30 03:44:35 +0000
+++ b/lisp/ChangeLog    2012-09-30 04:00:46 +0000
@@ -1,5 +1,8 @@
 2012-09-30  Stefan Monnier  <address@hidden>
 
+       * 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.

=== modified file 'lisp/winner.el'
--- a/lisp/winner.el    2012-09-29 23:52:03 +0000
+++ b/lisp/winner.el    2012-09-30 04:00:46 +0000
@@ -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 @@
 
 (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 @@
       (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