[nongnu] externals/caml 55b8c79 124/197: fixes bug 0004997

[Stefan Monnier]

branch: externals/caml
commit 55b8c79afcb9896763b4f4a000d8bdb66b8b57c9
Author: Didier Rémy <Didier.Remy@inria.fr>
Commit: Didier Rémy <Didier.Remy@inria.fr>

    fixes bug 0004997
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10322 
f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 camldebug.el | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/camldebug.el b/camldebug.el
index cc51c82..d5ba599 100644
--- a/camldebug.el
+++ b/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)