diff options
| author | Romain Francoise | 2008-09-28 16:56:48 +0000 |
|---|---|---|
| committer | Romain Francoise | 2008-09-28 16:56:48 +0000 |
| commit | ddee16047157a15fb4de0dba8ee2bcdb59d2fe00 (patch) | |
| tree | 741a7ed7129e50115f52ed58719d95a6def89bdd | |
| parent | 7581ba4099a4784e46d62de7df844751d341d984 (diff) | |
| download | emacs-ddee16047157a15fb4de0dba8ee2bcdb59d2fe00.tar.gz emacs-ddee16047157a15fb4de0dba8ee2bcdb59d2fe00.zip | |
(comint-show-output): Adjust to stickiness changes of the output field.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/comint.el | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f1ed3e07e35..37f06b10a84 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2008-09-28 Romain Francoise <romain@orebokech.com> | 1 | 2008-09-28 Romain Francoise <romain@orebokech.com> |
| 2 | 2 | ||
| 3 | * comint.el (comint-show-output): Adjust to stickiness changes of | ||
| 4 | the output field. | ||
| 5 | |||
| 3 | * startup.el (command-line): Start the daemon server later. | 6 | * startup.el (command-line): Start the daemon server later. |
| 4 | 7 | ||
| 5 | 2008-09-28 Martin Rudalics <rudalics@gmx.at> | 8 | 2008-09-28 Martin Rudalics <rudalics@gmx.at> |
diff --git a/lisp/comint.el b/lisp/comint.el index c639053c1ca..1070652d777 100644 --- a/lisp/comint.el +++ b/lisp/comint.el | |||
| @@ -2125,11 +2125,7 @@ Sets mark to the value of point when this command is run." | |||
| 2125 | (set-window-start (selected-window) (point)) | 2125 | (set-window-start (selected-window) (point)) |
| 2126 | (comint-skip-prompt)) | 2126 | (comint-skip-prompt)) |
| 2127 | (t | 2127 | (t |
| 2128 | (let* ((beg (field-beginning pos)) | 2128 | (goto-char (field-beginning pos)) |
| 2129 | (pt (if (= (point-min) beg) | ||
| 2130 | (point-min) | ||
| 2131 | (1+ beg)))) | ||
| 2132 | (goto-char pt)) | ||
| 2133 | (set-window-start (selected-window) (point)))))) | 2129 | (set-window-start (selected-window) (point)))))) |
| 2134 | 2130 | ||
| 2135 | 2131 | ||