diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2014-01-22 11:29:23 +0100 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2014-01-22 11:29:23 +0100 |
| commit | 6cb4da45dc3d0660a65b29e192e82a37e3ad505c (patch) | |
| tree | 310338ec8e359c9b3923e45b3437996c185a901b /lisp/term.el | |
| parent | 29f5e020a29c27e2b198069d0fe5ddc30b0a618f (diff) | |
| download | emacs-6cb4da45dc3d0660a65b29e192e82a37e3ad505c.tar.gz | |
Fixes in window size functions around Bug#16430 and Bug#16470.
* window.c (Fwindow_pixel_width, Fwindow_pixel_height)
(Fwindow_mode_line_height, Fwindow_header_line_height)
(Fwindow_right_divider_width, Fwindow_bottom_divider_width):
Minor doc-string adjustments.
(Fwindow_total_height, Fwindow_total_width): New argument ROUND.
Rewrite doc-strings.
(window_body_height, window_body_width): Do not count partially
visible lines/columns when PIXELWISE is nil (Bug#16470).
(Qfloor, Qceiling): New symbols.
* window.el (window-total-size, window-size): New argument
ROUND.
(window--min-delta-1, window-min-delta, window--max-delta-1): Be
more conservative when calculating the numbers of lines or
columns a window can shrink (Bug#16430).
(fit-window-to-buffer): Simplify code.
* term.el (term-window-width): Call window-body-width again.
Diffstat (limited to 'lisp/term.el')
| -rw-r--r-- | lisp/term.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/term.el b/lisp/term.el index 87898bac39f..97108c330a8 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -975,9 +975,8 @@ is buffer-local." (display-graphic-p) overflow-newline-into-fringe (/= (frame-parameter nil 'right-fringe) 0)) - ;; Call window-text-width instead of window-width (Bug#16470). - (window-text-width) - (1- (window-text-width)))) + (window-body-width) + (1- (window-body-width)))) (put 'term-mode 'mode-class 'special) |