From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 30 Oct 1995 19:22:23 +0000 (+0000)
Subject: (disassemble-internal): Handle lazy-loaded doc strings.
X-Git-Tag: emacs-19.34~2520
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3fd4909e45e7e7a487b72dd67b63bf2055ed72c2;p=emacs.git

(disassemble-internal): Handle lazy-loaded doc strings.
(disassemble-1): Handle lazy-loaded bytecode objects.
---

diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index 8a980db06ac..c541c89d294 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -114,7 +114,8 @@ redefine OBJECT if it is a symbol."
 			  (if name (format " %s" name) "")))))
     (let ((doc (if (consp obj)
 		   (and (stringp (car obj)) (car obj))
-		 (and (> (length obj) 4) (aref obj 4)))))
+		 ;; Use documentation to get lazy-loaded doc string
+		 (documentation obj t))))
       (if (and doc (stringp doc))
 	  (progn (and (consp obj) (setq obj (cdr obj)))
 		 (indent-to indent)
@@ -166,6 +167,8 @@ OBJ should be a call to BYTE-CODE generated by the byte compiler."
     (if (consp obj)
 	(setq bytes (car (cdr obj))		;the byte code
 	      constvec (car (cdr (cdr obj))))	;constant vector
+      ;; If it is lazy-loaded, load it now
+      (fetch-bytecode obj)
       (setq bytes (aref obj 1)
 	    constvec (aref obj 2)))
     (let ((lap (byte-decompile-bytecode bytes constvec))