diff options
| author | Juri Linkov <juri@linkov.net> | 2014-12-06 01:42:11 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2014-12-06 01:42:11 +0200 |
| commit | 0ffa34951a2c45afa7857b7a970459d0189b4313 (patch) | |
| tree | 036fa202a16fed130bf6094ab5398cbec20cd0a1 /lisp/minibuffer.el | |
| parent | 7409a79b1b2acf1229dd763f5eb7b96abc17113a (diff) | |
| download | emacs-0ffa34951a2c45afa7857b7a970459d0189b4313.tar.gz | |
Better check for displaying completions near the minibuffer.
* lisp/minibuffer.el (minibuffer-completion-help): Compare
selected-window with minibuffer-window to check whether
completions should be displayed near the minibuffer.
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00311.html
Fixes: debbugs:17809
Diffstat (limited to 'lisp/minibuffer.el')
| -rw-r--r-- | lisp/minibuffer.el | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 0bee13b155c..ee97174b0b2 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -1815,13 +1815,9 @@ 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. - ;; 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)) + ,(if (eq (selected-window) (minibuffer-window)) + 'display-buffer-at-bottom + 'display-buffer-below-selected)) (window-height . fit-window-to-buffer)) nil ;; Remove the base-size tail because `sort' requires a properly |