Fix some minibuffer bindings

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index f7c404dcb06ea48a9650cbd5f8304400ab7ef7ec..d6e2e8accfa3a4f29c6a8b5a1f74f579ff515e18 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2046,7 +2046,9 @@ Interactively, ARG is the prefix argument, and it defaults to 1."
                      minibuffer-cycle-completion-and-apply
                      minibuffer-cycle-completion-and-apply-alt
                      minibuffer-apply
-                     minibuffer-apply-alt)))
+                     minibuffer-apply-alt
+                     minibuffer-set-action
+                     minibuffer-exchange-actions)))
          (lambda ()
            (setq completion-all-sorted-completions nil))))))))
 
@@ -3538,7 +3540,7 @@ The completion method is determined by `completion-at-point-functions'."
   (define-key map "\C-x\M-h" 'minibuffer-alternate-history)
   (define-key map "\C-x\C-w" 'minibuffer-insert-symbol-at-point)
   (define-key map "\C-xj" 'minibuffer-set-action)
-  (define-key map "\C-xM-j" 'minibuffer-exchange-actions)
+  (define-key map "\C-x\M-j" 'minibuffer-exchange-actions)
   (define-key map "\n" 'minibuffer-apply)
   (define-key map (kbd "C-S-j") 'minibuffer-apply-alt)
   (define-key map "\r" 'exit-minibuffer))
@@ -3551,6 +3553,7 @@ The completion method is determined by `completion-at-point-functions'."
   "C-M-o"     #'minibuffer-apply-and-cycle-completion
   "C-M-S-o"   #'minibuffer-apply-alt-and-cycle-completion
   "M-o"       #'minibuffer-cycle-completion-and-apply
+  "M-O"       #'minibuffer-cycle-completion-and-apply-alt
   "M-S-o"     #'minibuffer-cycle-completion-and-apply-alt
   "C-l"       #'minibuffer-restore-completion-input
   "C-S-a"     #'minibuffer-toggle-completion-ignore-case
@@ -4618,9 +4621,11 @@ minibuffer action, apply the alternative action instead."
       (progn
         (setq minibuffer-alternative-action prm
               minibuffer-action alt)
-        (minibuffer-message
-         "Minibuffer action in now `%s', alternative is `%s'"
-         (cdr minibuffer-action) (cdr minibuffer-alternative-action)))
+        (if (get-buffer-window completions-buffer-name 0)
+            (minibuffer-completion-help)
+          (minibuffer-message
+           "Minibuffer action in now `%s', alternative is `%s'"
+           (cdr minibuffer-action) (cdr minibuffer-alternative-action))))
     (user-error "No current alternative minibuffer action"))
   (minibuffer-update-prompt-indicators))