[elpa] externals/mct 6bb328a795 24/64: Merge branch 'main' into experiment-completion-in-region

[ELPA Syncer]

branch: externals/mct
commit 6bb328a7959ffa31a66e3ce7ce9ed4c0087fd478
Merge: dedb62cce5 54c3ea65c5
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>

    Merge branch 'main' into experiment-completion-in-region
---
 mct.el | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/mct.el b/mct.el
index 7ecc584f42..47af702b9c 100644
--- a/mct.el
+++ b/mct.el
@@ -848,7 +848,7 @@ A candidate is recognised for as long as point is not past 
its
 last character."
   (interactive nil mct-mode)
   (when-let ((window (mct--get-completion-window))
-             (_mini (active-minibuffer-window)))
+             ((active-minibuffer-window)))
     (with-selected-window window
       (when-let* ((old-point (window-old-point window))
                   (pos (if (= old-point (point-min))
@@ -1020,20 +1020,19 @@ region.")
 
 (defvar mct-completion-list-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "M-v") #'scroll-down-command)
     (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 "n") #'mct-next-completion-or-mini)
     (define-key map [remap previous-line] #'mct-previous-completion-or-mini)
-    (define-key map (kbd "M-p") #'mct-previous-completion-group)
-    (define-key map (kbd "M-n") #'mct-next-completion-group)
     (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 "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 "<return>") #'mct-choose-completion-exit)
-    (define-key map (kbd "<M-return>") #'mct-choose-completion-dwim)
+    (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)
     map)
   "Derivative of `completion-list-mode-map'.")
@@ -1042,19 +1041,19 @@ region.")
   (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-e") #'mct-edit-completion)
-    (define-key map (kbd "<C-return>") #'mct-complete-and-exit)
-    (define-key map (kbd "C-n") #'mct-switch-to-completions-top)
-    (define-key map (kbd "<down>") #'mct-switch-to-completions-top)
-    (define-key map (kbd "C-p") #'mct-switch-to-completions-bottom)
-    (define-key map (kbd "<up>") #'mct-switch-to-completions-bottom)
+    (define-key map (kbd "C-RET") #'mct-complete-and-exit)
     (define-key map (kbd "C-l") #'mct-list-completions-toggle)
     map)
   "Derivative of `minibuffer-local-completion-map'.")
 
 (defvar mct-minibuffer-local-filename-completion-map
   (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "<backspace>") #'mct-backward-updir)
+    (define-key map (kbd "DEL") #'mct-backward-updir)
     map)
   "Derivative of `minibuffer-local-filename-completion-map'.")