[nongnu] externals/caml 98bd08b 011/197: Bug de l'affichage des evenements after.

[Stefan Monnier]

branch: externals/caml
commit 98bd08b6595cab406f62c143e9f746ac8649328d
Author: Jérôme Vouillon <Jerome.Vouillon@pps.jussieu.fr>
Commit: Jérôme Vouillon <Jerome.Vouillon@pps.jussieu.fr>

    Bug de l'affichage des evenements after.
    
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1734 
f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 camldebug.el | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/camldebug.el b/camldebug.el
index 5a0049b..d490739 100644
--- a/camldebug.el
+++ b/camldebug.el
@@ -621,7 +621,7 @@ Obeying it means displaying in another window the specified 
file and line."
       (camldebug-remove-current-event)
     (camldebug-display-line (car camldebug-last-frame)
                            (car (cdr camldebug-last-frame))
-                           (cdr (cdr camldebug-last-frame))))
+                           (car (cdr (cdr camldebug-last-frame)))))
   (setq camldebug-last-frame-displayed-p t))
 
 ;; Make sure the file named TRUE-FILE is in a buffer that appears on the screen
@@ -656,16 +656,13 @@ Obeying it means displaying in another window the 
specified file and line."
 
 (defun camldebug-set-current-event (pos buffer before)
   (if window-system
-      (progn
-        (if (save-excursion
-              (set-buffer buffer)
-              (goto-char (1+ pos))
-              (looking-at "\n"))
-            (setq pos (1- pos)))
-        (move-overlay camldebug-overlay-event pos (1+ pos) buffer)
-        (if before
-            (move-overlay camldebug-overlay-under (+ pos 1) (+ pos 3) buffer)
-          (move-overlay camldebug-overlay-under (- pos 2) pos buffer)))
+      (if before
+         (progn
+           (move-overlay camldebug-overlay-event pos (1+ pos) buffer)
+           (move-overlay camldebug-overlay-under
+                         (+ pos 1) (+ pos 3) buffer))
+       (move-overlay camldebug-overlay-event (1- pos) pos buffer)
+       (move-overlay camldebug-overlay-under (- pos 3) (- pos 1) buffer))
     (save-excursion
       (set-buffer buffer)
       (goto-char pos)