* lisp/minibuffer.el (minibuffer-completion-help): Compare this-command with completi...

Fixes: debbugs:17809

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b0192a545dd08edafe76d1309a502a1024fc262..e2bf6bdeeae91a2653240e19dac94dacdef064c2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-08  Juri Linkov  <juri@jurta.org>
+
+       * minibuffer.el (minibuffer-completion-help): Compare this-command
+       with completion-at-point.  (Bug#17809)
+
 2014-11-08  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/bytecomp.el (byte-compile-report-error):

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index fb74af2e0df3a165d65abf4fcaa4a351ac7cbcd3..c9ce381c87b28ed501883490a33b690de715faea 100644 (file)
--- 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))