(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 f8d2940..6e830e7 100644 (file)
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -413,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)
@@ -449,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