diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-09-30 00:00:46 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-09-30 00:00:46 -0400 |
| commit | 34cf6f39526599378cc1d5800e707a8a6e80c8dd (patch) | |
| tree | e4aad5ae56746ec374a894466ff946ffadc2212d /lisp/winner.el | |
| parent | e01c13fea4176aab4ec3dadc9e29e82efe967239 (diff) | |
| download | emacs-34cf6f39526599378cc1d5800e707a8a6e80c8dd.tar.gz | |
* lisp/winner.el (winner-mode-map): Obey winner-dont-bind-my-keys here.
(minor-mode-map-alist): Remove redundant code.
Diffstat (limited to 'lisp/winner.el')
| -rw-r--r-- | lisp/winner.el | 14 |
1 files changed, 4 insertions, 10 deletions
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 |