aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2000-08-12 01:48:25 +0000
committerMiles Bader2000-08-12 01:48:25 +0000
commit660394d1fb180a9edd42b7a56be43cfdcd9f97e2 (patch)
tree3c37eb26cdae2872d6fb22b147e95756527cf635
parent79e8dca7df9b65cea3843e5a9b5fed9bdb106747 (diff)
downloademacs-660394d1fb180a9edd42b7a56be43cfdcd9f97e2.tar.gz
emacs-660394d1fb180a9edd42b7a56be43cfdcd9f97e2.zip
(comint-output-filter): Don't bother frobbing window-start, it doesn't
seem to be necessary.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/comint.el9
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cfcdb82d84a..06ec05e464b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,7 @@
12000-08-12 Miles Bader <miles@gnu.org> 12000-08-12 Miles Bader <miles@gnu.org>
2
3 * comint.el (comint-output-filter): Don't bother frobbing
4 window-start, it doesn't seem to be necessary.
2 5
3 * comint.el (comint-send-string, comint-send-region): Make into 6 * comint.el (comint-send-string, comint-send-region): Make into
4 real functions. Snapshot the prompt before sending. 7 real functions. Snapshot the prompt before sending.
diff --git a/lisp/comint.el b/lisp/comint.el
index 1f0845d9ade..c7762678dd4 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1538,9 +1538,9 @@ This variable is permanent-local.")
1538 ;; Highlight the prompt, where we define `prompt' to mean 1538 ;; Highlight the prompt, where we define `prompt' to mean
1539 ;; the most recent output that doesn't end with a newline. 1539 ;; the most recent output that doesn't end with a newline.
1540 (unless (and (bolp) (null comint-last-prompt-overlay)) 1540 (unless (and (bolp) (null comint-last-prompt-overlay))
1541 ;; Need to create or move the prompt overlay (in the 1541 ;; Need to create or move the prompt overlay (in the case
1542 ;; case where's no prompt ((bolp) == t), we still do 1542 ;; where there is no prompt ((bolp) == t), we still do
1543 ;; this if there's already an existing overlay. 1543 ;; this if there's already an existing overlay).
1544 (let ((prompt-start (save-excursion (forward-line 0) (point)))) 1544 (let ((prompt-start (save-excursion (forward-line 0) (point))))
1545 (if comint-last-prompt-overlay 1545 (if comint-last-prompt-overlay
1546 ;; Just move an existing overlay 1546 ;; Just move an existing overlay
@@ -1554,9 +1554,6 @@ This variable is permanent-local.")
1554 (overlay-put comint-last-prompt-overlay 1554 (overlay-put comint-last-prompt-overlay
1555 'face 'comint-highlight-prompt-face))))) 1555 'face 'comint-highlight-prompt-face)))))
1556 1556
1557 ;; Don't insert initial prompt outside the top of the window.
1558 (if (= (window-start (selected-window)) (point))
1559 (set-window-start (selected-window) (- (point) (length string))))
1560 (if (and comint-last-input-end 1557 (if (and comint-last-input-end
1561 (marker-buffer comint-last-input-end) 1558 (marker-buffer comint-last-input-end)
1562 (= (point) comint-last-input-end)) 1559 (= (point) comint-last-input-end))