diff options
| author | Juri Linkov <juri@jurta.org> | 2014-11-09 00:56:37 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2014-11-09 00:56:37 +0200 |
| commit | 0ced1de32cc69645b0398c7401f8c0af5a6fcfd5 (patch) | |
| tree | a6c0c79dc48f709e68c863ffa99eafc93be0f654 /lisp/minibuffer.el | |
| parent | 4f9bd422ef57fa511bb2992f35a4936e1a229f59 (diff) | |
| download | emacs-0ced1de32cc69645b0398c7401f8c0af5a6fcfd5.tar.gz | |
* lisp/minibuffer.el (minibuffer-completion-help): Compare this-command with completion-at-point.
Fixes: debbugs:17809
Diffstat (limited to 'lisp/minibuffer.el')
| -rw-r--r-- | lisp/minibuffer.el | 5 |
1 files changed, 4 insertions, 1 deletions
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)) |