(debug-convert-byte-code): Convert the doc info to a string.

[bpt/emacs.git] / lisp / emacs-lisp / debug.el

diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 68a26d8..6e830e7 100644 (file)
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -30,6 +30,7 @@
 (defvar debug-function-list nil
   "List of functions currently set for debug on entry.")
 
+(defvar debugger-outer-match-data)
 (defvar debugger-outer-track-mouse)
 (defvar debugger-outer-last-command)
 (defvar debugger-outer-this-command)
@@ -56,7 +57,6 @@ any other args you like.  In that case, the list of args after the
 first will be printed into the backtrace buffer."
   (message "Entering debugger...")
   (let (debugger-value
-       (debugger-match-data (match-data))
        (debug-on-error nil)
        (debug-on-quit nil)
        (debugger-buffer (let ((default-major-mode 'fundamental-mode))
@@ -67,6 +67,7 @@ first will be printed into the backtrace buffer."
        (executing-macro nil)
        ;; Save the outer values of these vars for the `e' command
        ;; before we replace the values.
+       (debugger-outer-match-data (match-data))
        (debugger-outer-track-mouse track-mouse)
        (debugger-outer-last-command last-command)
        (debugger-outer-this-command this-command)
@@ -148,7 +149,7 @@ first will be printed into the backtrace buffer."
              (erase-buffer)
              (fundamental-mode))
          (kill-buffer debugger-buffer))
-       (store-match-data debugger-match-data)))
+       (store-match-data debugger-outer-match-data)))
     ;; Put into effect the modified values of these variables
     ;; in case the user set them with the `e' command.
     (setq track-mouse debugger-outer-track-mouse)
@@ -297,7 +298,9 @@ Applies to the frame whose line point is on in the backtrace."
          (standard-input debugger-outer-standard-input)
          (standard-output debugger-outer-standard-output)
          (cursor-in-echo-area debugger-outer-cursor-in-echo-area))
+      (store-match-data debugger-outer-match-data)
       (prog1 (eval-expression exp)
+       (setq debugger-outer-match-data (match-data))
        (setq debugger-outer-track-mouse track-mouse)
        (setq debugger-outer-last-command last-command)
        (setq debugger-outer-this-command this-command)
@@ -410,7 +413,10 @@ If argument is nil or an empty string, cancel for all functions."
          (if (nthcdr 5 contents)
              (setq body (cons (list 'interactive (nth 5 contents)) body)))
          (if (nth 4 contents)
-             (setq body (cons (nth 4 contents) body)))
+             ;; Use `documentation' here, to get the actual string,
+             ;; in case the compiled function has a reference
+             ;; to the .elc file.
+             (setq body (cons (documentation function) body)))
          (fset function (cons 'lambda (cons (car contents) body)))))))
 
 (defun debug-on-entry-1 (function defn flag)
@@ -446,6 +452,9 @@ If argument is nil or an empty string, cancel for all functions."
          (terpri)
          (setq list (cdr list))))
       (princ "Note: if you have redefined a function, then it may no longer\n")
-      (princ "be set to debug on entry, even if it is in the list."))))
+      (princ "be set to debug on entry, even if it is in the list."))
+    (save-excursion
+      (set-buffer standard-output)
+      (help-mode))))
 
 ;;; debug.el ends here