procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
(minor-mode-map-alist): Remove redundant code.
This commit is contained in:
Stefan Monnier 2012-09-30 00:00:46 -04:00
parent e01c13fea4
commit 34cf6f3952
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -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.

14
lisp/winner.el
View file

@ -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