mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00
Code Issues Releases Activity

(window-buffer-height): Use count-screen-lines.

Browse Source
This commit is contained in:
Stefan Monnier 2005-03-28 14:52:02 +00:00
parent 12566797d3
commit ba96f39200
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/ChangeLog
View File

@ -1,5 +1,7 @@
2005-03-28 Stefan Monnier <monnier@iro.umontreal.ca>
* window.el (window-buffer-height): Use count-screen-lines.
* progmodes/python.el (python-preoutput-leftover): New var.
(python-preoutput-filter): Use it.
(python-send-receive): Loop until all the result has been received.

21
lisp/window.el
View File

@ -397,20 +397,13 @@ lines than are actually needed in the case where some error may be present."
(defun window-buffer-height (window)
"Return the height (in screen lines) of the buffer that WINDOW is displaying."
(save-excursion
(set-buffer (window-buffer window))
(goto-char (point-min))
(let ((ignore-final-newline
;; If buffer ends with a newline, ignore it when counting height
;; unless point is after it.
(and (not (eobp)) (eq ?\n (char-after (1- (point-max)))))))
(+ 1 (nth 2 (compute-motion (point-min)
'(0 . 0)
(- (point-max) (if ignore-final-newline 1 0))
(cons 0 100000000)
nil
nil
window))))))
(with-current-buffer (window-buffer window)
(max 1
(count-screen-lines (point-min) (point-max)
;; If buffer ends with a newline, ignore it when
;; counting height unless point is after it.
(eobp)
window))))
(defun count-screen-lines (&optional beg end count-final-newline window)
"Return the number of screen lines in the region.