summaryrefslogtreecommitdiff
path: root/emacs/camldebug.el
diff options
context:
space:
mode:
authorDidier Rémy <Didier.Remy@inria.fr>2010-04-28 10:33:43 +0000
committerDidier Rémy <Didier.Remy@inria.fr>2010-04-28 10:33:43 +0000
commitffb6aee83e50014f41f8751db19ce80aa99e7d98 (patch)
tree3cf69a410f56f8de1acbc25ed42fc533f92215dd /emacs/camldebug.el
parent236ffb982a3df3cd3d14820404dbe85ddb992df7 (diff)
downloadocaml-ffb6aee83e50014f41f8751db19ce80aa99e7d98.tar.gz
fixes bug 0004997
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10322 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'emacs/camldebug.el')
-rw-r--r--emacs/camldebug.el13
1 files changed, 11 insertions, 2 deletions
diff --git a/emacs/camldebug.el b/emacs/camldebug.el
index cc51c8265c..d5ba599cc7 100644
--- a/emacs/camldebug.el
+++ b/emacs/camldebug.el
@@ -573,7 +573,11 @@ the camldebug commands `cd DIR' and `directory'."
(let ((output))
(if (buffer-name (process-buffer proc))
(let ((process-window))
- (save-excursion
+ ;; it does not seem necessary to save excursion here,
+ ;; since set-buffer as a temporary effect.
+ ;; comint-output-filter explicitly avoids it.
+ ;; in version 23, it prevents the marker to stay at end of buffer
+ ;; (save-excursion
(set-buffer (process-buffer proc))
;; If we have been so requested, delete the debugger prompt.
(if (marker-buffer camldebug-delete-prompt-marker)
@@ -590,7 +594,12 @@ the camldebug commands `cd DIR' and `directory'."
(>= (point) (process-mark proc))
(get-buffer-window (current-buffer))))
;; Insert the text, moving the process-marker.
- (comint-output-filter proc output))
+ (comint-output-filter proc output)
+ ;; )
+ ;; this was the end of save-excursion.
+ ;; if save-excursion is used (comint-next-prompt 1) would be needed
+ ;; to move the mark past then next prompt, but this is not as good
+ ;; as solution.
(if process-window
(save-selected-window
(select-window process-window)