aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/window.el
diff options
context:
space:
mode:
authorMartin Rudalics2012-10-27 10:58:30 +0200
committerMartin Rudalics2012-10-27 10:58:30 +0200
commitdf171c230cc8a5da73684740ff5cfa364fa8c1c4 (patch)
tree855aa18e00b00d43ec267e7dfbeccf64a0a8ad58 /lisp/window.el
parent05b621a6b22cb1c856a9f223d79203cb3ceaf29a (diff)
downloademacs-df171c230cc8a5da73684740ff5cfa364fa8c1c4.tar.gz
emacs-df171c230cc8a5da73684740ff5cfa364fa8c1c4.zip
In display-time-world restore fit-window-to-buffer behavior.
* window.el (display-buffer): In doc-string describe window-height and window-width alist entries. * time.el (display-time-world): Restore fit-window-to-buffer behavior.
Diffstat (limited to 'lisp/window.el')
-rw-r--r--lisp/window.el16
1 files changed, 16 insertions, 0 deletions
diff --git a/lisp/window.el b/lisp/window.el
index fa7b08375ce..bd043390d90 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5414,6 +5414,22 @@ Recognized alist entries include:
5414 parameters to give a new frame, if 5414 parameters to give a new frame, if
5415 one is created. 5415 one is created.
5416 5416
5417 `window-height' -- Value specifies either an integer (the number
5418 of lines of a new window), a floating point number (the
5419 fraction of a new window with respect to the height of the
5420 frame's root window) or a function to be called with one
5421 argument - a new window. The function is supposed to adjust
5422 the height of the window; its return value is ignored.
5423 Suitable functions are `shrink-window-if-larger-than-buffer'
5424 and `fit-window-to-buffer'.
5425
5426 `window-width' -- Value specifies either an integer (the number
5427 of columns of a new window), a floating point number (the
5428 fraction of a new window with respect to the width of the
5429 frame's root window) or a function to be called with one
5430 argument - a new window. The function is supposed to adjust
5431 the width of the window; its return value is ignored.
5432
5417The ACTION argument to `display-buffer' can also have a non-nil 5433The ACTION argument to `display-buffer' can also have a non-nil
5418and non-list value. This means to display the buffer in a window 5434and non-list value. This means to display the buffer in a window
5419other than the selected one, even if it is already displayed in 5435other than the selected one, even if it is already displayed in