diff --git a/evil-collection-ace-jump-mode.el b/evil-collection-ace-jump-mode.el index c0f50e7..a0ca96c 100644 --- a/evil-collection-ace-jump-mode.el +++ b/evil-collection-ace-jump-mode.el @@ -139,9 +139,10 @@ the mark and entering `recursive-edit'." (when evil-collection-ace-jump-mode-jump-active (add-hook 'post-command-hook #'evil-collection-ace-jump-mode-jump-exit-recursive-edit))) - (define-key evil-motion-state-map [remap ace-jump-char-mode] #'evil-ace-jump-char-mode) - (define-key evil-motion-state-map [remap ace-jump-line-mode] #'evil-ace-jump-line-mode) - (define-key evil-motion-state-map [remap ace-jump-word-mode] #'evil-ace-jump-word-mode)) + (evil-collection-define-key nil 'evil-motion-state-map + [remap ace-jump-char-mode] #'evil-ace-jump-char-mode + [remap ace-jump-line-mode] #'evil-ace-jump-line-mode + [remap ace-jump-word-mode] #'evil-ace-jump-word-mode)) (provide 'evil-collection-ace-jump-mode) ;;; evil-collection-ace-jump-mode.el ends here diff --git a/evil-collection-avy.el b/evil-collection-avy.el index 3e2a61a..37e8b86 100644 --- a/evil-collection-avy.el +++ b/evil-collection-avy.el @@ -114,7 +114,7 @@ Based on `evil-collection-ace-jump-mode-enclose-ace-jump-for-motion'." avy-goto-word-1-above avy-goto-word-1-below avy-goto-word-or-subword-1)) - (define-key evil-motion-state-map + (evil-collection-define-key nil 'evil-motion-state-map (vector 'remap command) (intern-soft (format "evil-%s" command))))) (provide 'evil-collection-avy) diff --git a/evil-collection-company.el b/evil-collection-company.el index 0e7522a..9938b25 100644 --- a/evil-collection-company.el +++ b/evil-collection-company.el @@ -54,24 +54,26 @@ be set through custom or before evil-collection loads." (defun evil-collection-company-setup () "Set up `evil' bindings for `company'." - (define-key company-active-map (kbd "C-n") 'company-select-next-or-abort) - (define-key company-active-map (kbd "C-p") 'company-select-previous-or-abort) - (define-key company-active-map (kbd "C-j") 'company-select-next-or-abort) - (define-key company-active-map (kbd "C-k") 'company-select-previous-or-abort) - (define-key company-active-map (kbd "M-j") 'company-select-next) - (define-key company-active-map (kbd "M-k") 'company-select-previous) + (evil-collection-define-key nil 'company-active-map + (kbd "C-n") 'company-select-next-or-abort + (kbd "C-p") 'company-select-previous-or-abort + (kbd "C-j") 'company-select-next-or-abort + (kbd "C-k") 'company-select-previous-or-abort + (kbd "M-j") 'company-select-next + (kbd "M-k") 'company-select-previous) (when evil-want-C-u-scroll - (define-key company-active-map (kbd "C-u") 'company-previous-page)) + (evil-collection-define-key nil 'company-active-map (kbd "C-u") 'company-previous-page)) (when evil-want-C-d-scroll - (define-key company-active-map (kbd "C-d") 'company-next-page)) + (evil-collection-define-key nil 'company-active-map (kbd "C-d") 'company-next-page)) - (define-key company-search-map (kbd "C-j") 'company-select-next-or-abort) - (define-key company-search-map (kbd "C-k") 'company-select-previous-or-abort) - (define-key company-search-map (kbd "M-j") 'company-select-next) - (define-key company-search-map (kbd "M-k") 'company-select-previous) - (define-key company-search-map (kbd "") 'company-search-abort) + (evil-collection-define-key nil 'company-search-map + (kbd "C-j") 'company-select-next-or-abort + (kbd "C-k") 'company-select-previous-or-abort + (kbd "M-j") 'company-select-next + (kbd "M-k") 'company-select-previous + (kbd "") 'company-search-abort) ;; Sets up YCMD like behavior. (when evil-collection-company-use-tng (company-tng-configure-default))) diff --git a/evil-collection-edebug.el b/evil-collection-edebug.el index a973248..701eb5c 100644 --- a/evil-collection-edebug.el +++ b/evil-collection-edebug.el @@ -41,8 +41,9 @@ (add-hook 'edebug-mode-hook #'evil-normalize-keymaps) - (define-key edebug-mode-map "g" nil) - (define-key edebug-mode-map "G" nil) + (evil-collection-define-key nil 'edebug-mode-map + "g" nil + "G" nil) ;; FIXME: Seems like other minor modes will readily clash with `edebug'. ;; `lispyville' and `edebug' 's' key? diff --git a/evil-collection-elisp-mode.el b/evil-collection-elisp-mode.el index c0b23df..6a78b80 100644 --- a/evil-collection-elisp-mode.el +++ b/evil-collection-elisp-mode.el @@ -38,10 +38,11 @@ BEG and END are the start and end of the output in current-buffer. VALUE is the Lisp value printed, ALT1 and ALT2 are strings for the alternative printed representations that can be displayed." (let ((map (make-sparse-keymap))) - (define-key map (kbd "C-m") - 'evil-collection-elisp-mode-return-or-last-sexp-toggle-display) - (define-key map [down-mouse-2] 'mouse-set-point) - (define-key map [mouse-2] 'elisp-last-sexp-toggle-display) + (evil-collection-define-key nil map + (kbd "C-m") + 'evil-collection-elisp-mode-return-or-last-sexp-toggle-display + [down-mouse-2] 'mouse-set-point + [mouse-2] 'elisp-last-sexp-toggle-display) (add-text-properties beg end `(printed-value (,value ,alt1 ,alt2) diff --git a/evil-collection-etags-select.el b/evil-collection-etags-select.el index a35ad30..b29f220 100644 --- a/evil-collection-etags-select.el +++ b/evil-collection-etags-select.el @@ -32,7 +32,8 @@ (defun evil-collection-etags-select-setup () "Set up `evil' bindings for `etags-select'.." ;; FIXME: probably etags-select should be recomended in docs - (define-key evil-motion-state-map "g]" 'etags-select-find-tag-at-point)) + (evil-collection-define-key nil 'evil-motion-state-map + "g]" 'etags-select-find-tag-at-point)) (provide 'evil-collection-etags-select) ;;; evil-collection-etags-select.el ends here diff --git a/evil-collection-popup.el b/evil-collection-popup.el index fdb0ac5..cce0716 100644 --- a/evil-collection-popup.el +++ b/evil-collection-popup.el @@ -35,8 +35,9 @@ (defun evil-collection-popup-setup () "Set up `evil' bindings for `popup'." (defvar popup-menu-keymap) - (define-key popup-menu-keymap (kbd "C-j") 'popup-next) - (define-key popup-menu-keymap (kbd "C-k") 'popup-previous)) + (evil-collection-define-key nil 'popup-menu-keymap + (kbd "C-j") 'popup-next + (kbd "C-k") 'popup-previous)) (provide 'evil-collection-popup) ;;; evil-collection-popup.el ends here diff --git a/evil-collection-realgud.el b/evil-collection-realgud.el index e38e277..075d2bc 100644 --- a/evil-collection-realgud.el +++ b/evil-collection-realgud.el @@ -52,15 +52,15 @@ "i" 'realgud:cmd-step "!" 'realgud:cmd-shell - ;; (define-key map [M-down] 'realgud-track-hist-newer) - ;; (define-key map [M-kp-2] 'realgud-track-hist-newer) - ;; (define-key map [M-up] 'realgud-track-hist-older) - ;; (define-key map [M-kp-8] 'realgud-track-hist-older) - ;; (define-key map [M-kp-up] 'realgud-track-hist-older) - ;; (define-key map [M-kp-down] 'realgud-track-hist-newer) - ;; (define-key map [M-print] 'realgud-track-hist-older) - ;; (define-key map [M-S-down] 'realgud-track-hist-newest) - ;; (define-key map [M-S-up] 'realgud-track-hist-oldest) + ;; (evil-collection-define-key nil map [M-down] 'realgud-track-hist-newer) + ;; (evil-collection-define-key nil map [M-kp-2] 'realgud-track-hist-newer) + ;; (evil-collection-define-key nil map [M-up] 'realgud-track-hist-older) + ;; (evil-collection-define-key nil map [M-kp-8] 'realgud-track-hist-older) + ;; (evil-collection-define-key nil map [M-kp-up] 'realgud-track-hist-older) + ;; (evil-collection-define-key nil map [M-kp-down] 'realgud-track-hist-newer) + ;; (evil-collection-define-key nil map [M-print] 'realgud-track-hist-older) + ;; (evil-collection-define-key nil map [M-S-down] 'realgud-track-hist-newest) + ;; (evil-collection-define-key nil map [M-S-up] 'realgud-track-hist-oldest) ) (evil-collection-define-key 'normal 'realgud:shortkey-mode-map diff --git a/evil-collection-which-key.el b/evil-collection-which-key.el index 38ef7a1..ee0b4e8 100644 --- a/evil-collection-which-key.el +++ b/evil-collection-which-key.el @@ -40,11 +40,12 @@ (defun evil-collection-which-key-setup () "Set up `evil' bindings for `which-key'." - ;; (define-key which-key-C-h-map "u" 'which-key-undo-key) - (define-key which-key-C-h-map "q" 'which-key-abort) - (define-key which-key-C-h-map "j" 'which-key-show-next-page-cycle) - (define-key which-key-C-h-map "k" 'which-key-show-previous-page-cycle) - (define-key which-key-C-h-map "?" 'which-key-show-standard-help)) + ;; (evil-collection-define-key nil 'which-key-C-h-map "u" 'which-key-undo-key) + (evil-collection-define-key nil 'which-key-C-h-map + "q" 'which-key-abort + "j" 'which-key-show-next-page-cycle + "k" 'which-key-show-previous-page-cycle + "?" 'which-key-show-standard-help)) (provide 'evil-collection-which-key) ;;; evil-collection-which-key.el ends here