(debugger-setup-buffer): When an eval-buffer frame was reading from a buffer,

insert indication of the buffer position.
(debugger-frame-number): Ignore ;;;-comment lines in backtrace.

diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 028344612e71d3b43d46c888f7ba41a16cbfdc40..aecfb93a3c51e2e080ef4edf3d9464a31c4dc169 100644 (file)
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -272,6 +272,13 @@ That buffer should be current already."
                    (cdr debugger-args) debugger-args)
                (current-buffer))
         (insert ?\n)))
+  (when (re-search-forward "^  eval-buffer(" nil t)
+    (end-of-line)
+    (insert (format "\n  ;;; Reading at buffer position %d"
+                   (let ((level (+ (debugger-frame-number)
+                                   debugger-frame-offset -4)))
+                     (with-current-buffer (nth 2 (backtrace-frame level))
+                       (point))))))
   (debugger-make-xrefs))
 
 (defun debugger-make-xrefs (&optional buffer)
@@ -423,6 +430,8 @@ will be used, such as in a debug on exit from a frame."
                 (forward-sexp 2))
               (forward-line 1)
               (<= (point) opoint))
+       (if (looking-at " *;;;")
+           (forward-line 1))
        (setq count (1+ count)))
       count)))