diff options
| author | Juri Linkov <juri@linkov.net> | 2018-02-10 23:55:34 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2018-02-10 23:55:34 +0200 |
| commit | 09465bfa063a62f03ea746685111632a832068b9 (patch) | |
| tree | f68f93506634ede11dca28fd8d3c0c8d40e548c5 /lisp/minibuffer.el | |
| parent | aaeb101d899a09e18630466c348041a172cd5d91 (diff) | |
| download | emacs-09465bfa063a62f03ea746685111632a832068b9.tar.gz | |
* lisp/window.el (display-buffer--maybe-at-bottom): New function (bug#30314).
(display-buffer--maybe-pop-up-frame)
(display-buffer--maybe-pop-up-window): New functions created from
display-buffer--maybe-pop-up-frame-or-window.
(display-buffer--maybe-pop-up-frame-or-window): Call
display-buffer--maybe-pop-up-frame or
display-buffer--maybe-pop-up-window.
(display-buffer-at-bottom): Fix parens.
* lisp/minibuffer.el (minibuffer-completion-help): Use
display-buffer--maybe-pop-up-frame instead of let-binding
pop-up-windows to nil.
* lisp/files.el (hack-local-variables-confirm)
(save-buffers-kill-emacs): Use display-buffer--maybe-at-bottom.
Diffstat (limited to 'lisp/minibuffer.el')
| -rw-r--r-- | lisp/minibuffer.el | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index ef0d40790c5..e3ae2912a86 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -1824,12 +1824,7 @@ variables.") ;; window, mark it as softly-dedicated, so bury-buffer in ;; minibuffer-hide-completions will know whether to ;; delete the window or not. - (display-buffer-mark-dedicated 'soft) - ;; Disable `pop-up-windows' temporarily to allow - ;; `display-buffer--maybe-pop-up-frame-or-window' - ;; in the display actions below to pop up a frame - ;; if `pop-up-frames' is non-nil, but not to pop up a window. - (pop-up-windows nil)) + (display-buffer-mark-dedicated 'soft)) (with-displayed-buffer-window "*Completions*" ;; This is a copy of `display-buffer-fallback-action' @@ -1837,7 +1832,7 @@ variables.") ;; with `display-buffer-at-bottom'. `((display-buffer--maybe-same-window display-buffer-reuse-window - display-buffer--maybe-pop-up-frame-or-window + display-buffer--maybe-pop-up-frame ;; 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. |