diff options
| author | Miles Bader <miles@gnu.org> | 2006-07-06 08:59:39 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-07-06 08:59:39 +0000 |
| commit | 6a46b0188332c8007c23014bd0ba97441be6abe8 (patch) | |
| tree | e6bad7efe8102d87934fbae8f1b34341cd4e4957 /lisp/term.el | |
| parent | 5ed089581a49f8f0eba2d911203ff5db57eac322 (diff) | |
| parent | 978db1472a9d4bbaafbc93b9176f7c409ac209bd (diff) | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 320-342)
- Update from CVS
- Merge from gnus--rel--5.10
- lisp/play/cookie1.el (cookie): Work properly when there's only one entry
- Add note about "link" button-class to etc/TODO
* gnus--rel--5.10 (patch 108-112)
- Merge from emacs--devo--0
- Clean up merge mistakes
- Update from CVS
- Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86
Diffstat (limited to 'lisp/term.el')
| -rw-r--r-- | lisp/term.el | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/term.el b/lisp/term.el index cdaa72b7d94..5cf0887163d 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -3766,6 +3766,9 @@ Should only be called when point is at the start of a screen line." (save-start-line-column term-start-line-column) (save-current-row (term-current-row))) ;; The number of inserted lines shouldn't exceed the scroll region end. + ;; The `term-scroll-end' line is part of the scrolling region, so + ;; we need to go one line past it in order to ensure correct + ;; scrolling. (when (> (+ save-current-row lines) (1+ term-scroll-end)) (setq lines (- lines (- (+ save-current-row lines) (1+ term-scroll-end))))) (term-down lines) @@ -3784,6 +3787,9 @@ Should only be called when point is at the start of a screen line." (save-start-line-column term-start-line-column) (save-current-row (term-current-row))) ;; Inserting lines should take into account the scroll region. + ;; The `term-scroll-end' line is part of the scrolling region, so + ;; we need to go one line past it in order to ensure correct + ;; scrolling. (if (< save-current-row term-scroll-start) ;; If point is before scroll start, (progn |