diff options
| author | Richard M. Stallman | 1993-11-10 00:38:47 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-11-10 00:38:47 +0000 |
| commit | 0613507b4fc1f5fdb73fc4e98288413d77848c9f (patch) | |
| tree | 2f6930a016e4ca5cf2d098855315f1f90874b1e9 | |
| parent | 25f91a1e2bd5271c84bb5697f4d4589f789187c5 (diff) | |
| download | emacs-0613507b4fc1f5fdb73fc4e98288413d77848c9f.tar.gz emacs-0613507b4fc1f5fdb73fc4e98288413d77848c9f.zip | |
(comint-postoutput-scroll-to-bottom):
Don't alter point in a window if it's after the process-mark.
| -rw-r--r-- | lisp/comint.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/comint.el b/lisp/comint.el index 771be5e5838..dd0e61559fa 100644 --- a/lisp/comint.el +++ b/lisp/comint.el | |||
| @@ -1197,14 +1197,14 @@ This function should be in the list `comint-output-filter-functions'." | |||
| 1197 | (if (eq (window-buffer window) current) | 1197 | (if (eq (window-buffer window) current) |
| 1198 | (progn | 1198 | (progn |
| 1199 | (select-window window) | 1199 | (select-window window) |
| 1200 | (if (or (eq scroll t) (eq scroll 'all) | 1200 | (if (and (< (point) (process-mark process)) |
| 1201 | ;; Maybe user wants point to jump to the end. | 1201 | (or (eq scroll t) (eq scroll 'all) |
| 1202 | (and (eq scroll 'this) (eq selected window)) | 1202 | ;; Maybe user wants point to jump to the end. |
| 1203 | (and (eq scroll 'others) (not (eq selected window))) | 1203 | (and (eq scroll 'this) (eq selected window)) |
| 1204 | ;; If point was at the end, keep it at the end. | 1204 | (and (eq scroll 'others) (not (eq selected window))) |
| 1205 | (and (>= (point) | 1205 | ;; If point was at the end, keep it at the end. |
| 1206 | (- (process-mark process) (length string))) | 1206 | (>= (point) |
| 1207 | (< (point) (process-mark process)))) | 1207 | (- (process-mark process) (length string))))) |
| 1208 | (goto-char (process-mark process))) | 1208 | (goto-char (process-mark process))) |
| 1209 | ;; Optionally scroll so that the text | 1209 | ;; Optionally scroll so that the text |
| 1210 | ;; ends at the bottom of the window. | 1210 | ;; ends at the bottom of the window. |