branch: externals/mct
commit 7364dc45af82b63221e66688bfadecb4becae320
Author: Protesilaos Stavrou <i...@protesilaos.com>
Commit: Protesilaos Stavrou <i...@protesilaos.com>
Remove all key remappings
I got a bug report via email:
* The user had a command remapped to M-g M-g.
* Mct was loaded before the definition of that remapping.
* The user's command took precedence over Mct's own M-g M-g.
Everything works as expected once we specify the key bindings
explicitly.
---
mct.el | 41 +++++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/mct.el b/mct.el
index 4ffd493296..7e30157d48 100644
--- a/mct.el
+++ b/mct.el
@@ -1029,33 +1029,33 @@ region.")
(defvar mct-minibuffer-completion-list-map
(let ((map (make-sparse-keymap)))
- (define-key map [remap keyboard-quit] #'mct-keyboard-quit-dwim)
- (define-key map [remap goto-line] #'mct-choose-completion-number)
- (define-key map [remap next-line] #'mct-next-completion-or-mini)
+ (define-key map (kbd "C-g") #'mct-keyboard-quit-dwim)
+ (define-key map (kbd "M-g g") #'mct-choose-completion-number)
+ (define-key map (kbd "M-g M-g") #'mct-choose-completion-number)
+ (define-key map (kbd "C-n") #'mct-next-completion-or-mini)
(define-key map (kbd "n") #'mct-next-completion-or-mini)
- (define-key map [remap previous-line] #'mct-previous-completion-or-mini)
+ (define-key map (kbd "C-p") #'mct-previous-completion-or-mini)
(define-key map (kbd "p") #'mct-previous-completion-or-mini)
- (define-key map [remap backward-paragraph] #'mct-previous-completion-group)
- (define-key map [remap forward-paragraph] #'mct-next-completion-group)
- (define-key map (kbd "M-p") #'mct-previous-completion-group)
+ (define-key map (kbd "M-}") #'mct-next-completion-group)
(define-key map (kbd "M-n") #'mct-next-completion-group)
+ (define-key map (kbd "M-{") #'mct-previous-completion-group)
+ (define-key map (kbd "M-p") #'mct-previous-completion-group)
(define-key map (kbd "e") #'mct-focus-minibuffer)
(define-key map (kbd "M-e") #'mct-edit-completion)
(define-key map (kbd "TAB") #'mct-choose-completion-no-exit)
(define-key map (kbd "RET") #'mct-choose-completion-exit)
(define-key map (kbd "M-RET") #'mct-choose-completion-dwim)
- (define-key map [remap beginning-of-buffer] #'mct-beginning-of-buffer)
+ (define-key map (kbd "M-<") #'mct-beginning-of-buffer)
map)
"Derivative of `completion-list-mode-map'.")
(defvar mct-minibuffer-local-completion-map
(let ((map (make-sparse-keymap)))
(define-key map (kbd "C-j") #'exit-minibuffer)
- (define-key map [remap goto-line] #'mct-choose-completion-number)
- (define-key map [remap next-line] #'mct-switch-to-completions-top)
- (define-key map [remap next-line-or-history-element]
#'mct-switch-to-completions-top)
- (define-key map [remap previous-line] #'mct-switch-to-completions-bottom)
- (define-key map [remap previous-line-or-history-element]
#'mct-switch-to-completions-bottom)
+ (define-key map (kbd "M-g g") #'mct-choose-completion-number)
+ (define-key map (kbd "M-g M-g") #'mct-choose-completion-number)
+ (define-key map (kbd "C-n") #'mct-switch-to-completions-top)
+ (define-key map (kbd "C-p") #'mct-switch-to-completions-bottom)
(define-key map (kbd "M-e") #'mct-edit-completion)
(define-key map (kbd "C-<return>") #'mct-complete-and-exit)
(define-key map (kbd "C-l") #'mct-list-completions-toggle)
@@ -1151,8 +1151,8 @@ Meant to be added to `after-change-functions'."
(defvar mct-region-buffer-map
(let ((map (make-sparse-keymap)))
- (define-key map [remap next-line] #'mct-switch-to-completions-top)
- (define-key map [remap previous-line] #'mct-switch-to-completions-bottom)
+ (define-key map (kbd "C-n") #'mct-switch-to-completions-top)
+ (define-key map (kbd "C-p") #'mct-switch-to-completions-bottom)
;; TODO: Either keep the TAB=completion-at-point binding or add our own
;; command which is compatible with orderless completion.
(define-key map (kbd "TAB") #'ignore)
@@ -1212,17 +1212,18 @@ minibuffer)."
(defvar mct-region-completion-list-map
(let ((map (make-sparse-keymap)))
- (define-key map [remap next-line] #'mct-next-completion-or-quit)
- (define-key map [remap previous-line] #'mct-previous-completion-or-quit)
+ (define-key map (kbd "C-g") #'mct-next-completion-or-quit)
+ (define-key map (kbd "C-n") #'mct-next-completion-or-quit)
(define-key map (kbd "n") #'mct-next-completion-or-quit)
+ (define-key map (kbd "C-p") #'mct-previous-completion-or-quit)
(define-key map (kbd "p") #'mct-previous-completion-or-quit)
- (define-key map [remap backward-paragraph] #'mct-previous-completion-group)
- (define-key map [remap forward-paragraph] #'mct-next-completion-group)
+ (define-key map (kbd "M-}") #'mct-next-completion-group)
(define-key map (kbd "M-n") #'mct-next-completion-group)
+ (define-key map (kbd "M-{") #'mct-previous-completion-group)
(define-key map (kbd "M-p") #'mct-previous-completion-group)
(define-key map (kbd "TAB") #'choose-completion)
(define-key map (kbd "RET") #'choose-completion)
- (define-key map [remap beginning-of-buffer] #'mct-beginning-of-buffer)
+ (define-key map (kbd "M-<") #'mct-beginning-of-buffer)
map)
"Derivative of `completion-list-mode-map'.")
