(debugger-setup-buffer): When eval-buffer

was called with nil for the buffer, handle the read position right.
Handle read position for eval-region, too.

1 files changed, 9 insertions, 2 deletions

diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 94cca83a61d..76d86985079 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -314,8 +314,15 @@ That buffer should be current already."
   (save-excursion
     (while (re-search-forward "^  eval-buffer(" nil t)
       (end-of-line)
-      (insert (format "\n  ;;; Reading at buffer position %d"
-                      (with-current-buffer (nth 2 (backtrace-frame (debugger-frame-number)))
+      (insert (format "  ; Reading at buffer position %d"
+                      (with-current-buffer
+                          (or (nth 2 (backtrace-frame (debugger-frame-number)))
+                              debugger-old-buffer)
+                        (point)))))
+    (while (re-search-forward "^  eval-region(" nil t)
+      (end-of-line)
+      (insert (format "  ; Reading at buffer position %d"
+                      (with-current-buffer debugger-old-buffer
                         (point))))))
   (debugger-make-xrefs))