(term-set-scroll-region, term-handle-ansi-escape):

Undo last change, which didn't fix the problem and introduced others.

2 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad40f3a2e1a..d0394edc7af 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * term.el (term-set-scroll-region, term-handle-ansi-escape):
+        Undo last change, which didn't fix the problem and introduced others.
+
 2009-09-24  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-mi.el: Don't require speedbar.
diff --git a/lisp/term.el b/lisp/term.el
index 2d52bdc0f1c..b7eb9fd1845 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -3369,8 +3369,7 @@ Set it to nil to disable bold.")
    ((eq char ?r)
     (term-set-scroll-region
      (1- term-terminal-previous-parameter)
-     (1- term-terminal-parameter))
-    (term-goto 0 0))
+     (1- term-terminal-parameter)))
    (t)))
 
 (defun term-set-scroll-region (top bottom)
@@ -3390,7 +3389,8 @@ The top-most line is line 0."
         (or (term-using-alternate-sub-buffer)
             (not (and (= term-scroll-start 0)
                       (= term-scroll-end term-height)))))
-  (term-move-columns (- (term-current-column))))
+  (term-move-columns (- (term-current-column)))
+  (term-goto 0 0))
 
 ;; (defun term-switch-to-alternate-sub-buffer (set)
 ;;   ;; If asked to switch to (from) the alternate sub-buffer, and already (not)