From: Juri Linkov Date: Sat, 8 Nov 2014 22:56:37 +0000 (+0200) Subject: * lisp/minibuffer.el (minibuffer-completion-help): Compare this-command with completi... X-Git-Tag: emacs-25.0.90~2635^2~530 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ced1de32cc69645b0398c7401f8c0af5a6fcfd5;p=emacs.git * lisp/minibuffer.el (minibuffer-completion-help): Compare this-command with completion-at-point. Fixes: debbugs:17809 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b0192a545d..e2bf6bdeeae 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-08 Juri Linkov + + * minibuffer.el (minibuffer-completion-help): Compare this-command + with completion-at-point. (Bug#17809) + 2014-11-08 Glenn Morris * emacs-lisp/bytecomp.el (byte-compile-report-error): diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index fb74af2e0df..c9ce381c87b 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -1811,7 +1811,10 @@ variables.") ;; Use `display-buffer-below-selected' for inline completions, ;; but not in the minibuffer (e.g. in `eval-expression') ;; for which `display-buffer-at-bottom' is used. - ,(if (and completion-in-region-mode-predicate + ;; Compare `this-command' with `completion-at-point' + ;; since `completion--in-region-1' sets `this-command' + ;; to this value for region completion commands. + ,(if (and (eq this-command 'completion-at-point) (not (minibuffer-selected-window))) 'display-buffer-below-selected 'display-buffer-at-bottom))