summaryrefslogtreecommitdiff
path: root/lisp/dired.el
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2012-09-30 11:10:59 +0200
committerMartin Rudalics <rudalics@gmx.at>2012-09-30 11:10:59 +0200
commit5938d5196d09aff887aa74603c102b1f303a613a (patch)
tree57c528aafa761114bf2528593a85642e6e3e5e21 /lisp/dired.el
parenta97dc380601446c00adfbd1d8e86e73e7d81a359 (diff)
downloademacs-5938d5196d09aff887aa74603c102b1f303a613a.tar.gz
Handle window-height and window-width alist entries in `display-buffer'.
In buffer display functions handle window-height/window-width alist entries. Suggested by Juri Linkov as fix for Bug#1806. * window.el (window--display-buffer): New argument ALIST. Obey window-height and window-width alist entries. (window--try-to-split-window): New argument ALIST. Bind window-combination-limit to t when the window's size shall be changed and window-combination-limit equals `window-size'. (display-buffer-in-atom-window) (display-buffer-in-major-side-window) (display-buffer-in-side-window, display-buffer-same-window) (display-buffer-reuse-window, display-buffer-pop-up-frame) (display-buffer-pop-up-window, display-buffer-below-selected) (display-buffer-at-bottom, display-buffer-in-previous-window) (display-buffer-use-some-window): Adjust all callers of window--display-buffer and window--try-to-split-window. (fit-frame-to-buffer): New option. (fit-window-to-buffer): Can resize frames if fit-frame-to-buffer is non-nil. (display-buffer-in-major-side-window): Evaluate window-height / window-width alist entries. * help.el (temp-buffer-resize-frames) (temp-buffer-resize-regexps): Remove options. (temp-buffer-resize-mode): Adjust doc-string. (resize-temp-buffer-window): Don't consult temp-buffer-resize-regexps. Use fit-frame-to-buffer instead of temp-buffer-resize-frames. * dired.el (dired-mark-pop-up): Call display-buffer-below-selected with a fit-window-to-buffer alist entry. * window.c (Vwindow_combination_limit): New default value. (Qwindow_size): New symbol replacing Qtemp_buffer_resize.
Diffstat (limited to 'lisp/dired.el')
-rw-r--r--lisp/dired.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/dired.el b/lisp/dired.el
index e0f90b321aa..8cb3902161a 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2997,7 +2997,8 @@ argument or confirmation)."
(let ((split-height-threshold 0))
(with-temp-buffer-window
buffer
- (cons 'display-buffer-below-selected nil)
+ (cons 'display-buffer-below-selected
+ '((window-height . fit-window-to-buffer)))
#'(lambda (window _value)
(with-selected-window window
(unwind-protect