JimB's changes since January 18th

1 files changed, 5 insertions, 4 deletions

diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index 09f6ea3d687..aca4f015bb1 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -41,6 +41,7 @@
 
 (defvar disassemble-recursive-indent 3 "*")
 
+;;;###autoload
 (defun disassemble (object &optional buffer indent interactive-p)
   "Print disassembled code for OBJECT in (optional) BUFFER.
 OBJECT can be a symbol defined as a function, or a function itself
@@ -136,7 +137,7 @@ redefine OBJECT if it is a symbol."
 	    (insert "\n"))))
     (cond ((and (consp obj) (assq 'byte-code obj))
 	   (disassemble-1 (assq 'byte-code obj) indent))
-	  ((compiled-function-p obj)
+	  ((byte-code-function-p obj)
 	   (disassemble-1 obj indent))
 	  (t
 	   (insert "Uncompiled body:  ")
@@ -195,14 +196,14 @@ OBJ should be a call to BYTE-CODE generated by the byte compiler."
 		 (setq arg (car arg))
 		 ;; but if the value of the constant is compiled code, then
 		 ;; recursively disassemble it.
-		 (cond ((or (compiled-function-p arg)
+		 (cond ((or (byte-code-function-p arg)
 			    (and (eq (car-safe arg) 'lambda)
 				 (assq 'byte-code arg))
 			    (and (eq (car-safe arg) 'macro)
-				 (or (compiled-function-p (cdr arg))
+				 (or (byte-code-function-p (cdr arg))
 				     (and (eq (car-safe (cdr arg)) 'lambda)
 					  (assq 'byte-code (cdr arg))))))
-			(cond ((compiled-function-p arg)
+			(cond ((byte-code-function-p arg)
 			       (insert "<compiled-function>\n"))
 			      ((eq (car-safe arg) 'lambda)
 			       (insert "<compiled lambda>"))