--- a/lisp/disass.el	Mon Aug 13 11:06:08 2007 +0200
+++ b/lisp/disass.el	Mon Aug 13 11:07:10 2007 +0200
@@ -39,18 +39,12 @@
 
 ;;; Code:
 
-;;; The variable byte-code-vector is defined by the new bytecomp.el.
-;;; The function byte-decompile-lapcode is defined in byte-opt.el.
-;;; Since we don't use byte-decompile-lapcode, let's try not loading byte-opt.
-;;; The variable byte-code-vector is defined by the new bytecomp.el.
-;;; The function byte-decompile-lapcode is defined in byte-optimize.el.
 (require 'byte-optimize)
 
 (defvar disassemble-column-1-indent 8 "*")
 (defvar disassemble-column-2-indent 10 "*")
 (defvar disassemble-recursive-indent 3 "*")
 
-
 ;;;###autoload
 (defun disassemble (object &optional buffer indent interactive-p)
   "Print disassembled code for OBJECT in (optional) BUFFER.
@@ -75,8 +69,8 @@
 
 
 (defun disassemble-internal (obj indent interactive-p)
-  (let ((macro 'nil)
-	(name 'nil)
+  (let ((macro nil)
+	(name nil)
 	args)
     (while (symbolp obj)
       (setq name obj
@@ -169,8 +163,8 @@
 
 
 (defun disassemble-1 (obj indent)
-  "Prints the byte-code call OBJ in the current buffer.
-OBJ should be a call to BYTE-CODE generated by the byte compiler."
+  "Print the byte-code call OBJ in the current buffer.
+OBJ should be a compiled-function object generated by the byte compiler."
   (let (bytes constvec)
     (if (consp obj)
 	(setq bytes (car (cdr obj))		; the byte code
@@ -254,10 +248,10 @@
 		       ((eq (car-safe (car-safe arg)) 'byte-code)
 			(insert "(<byte code>...)\n")
 			(mapcar		;recurse on list of byte-code objects
-			 '(lambda (obj)
-			    (disassemble-1
-			     obj
-			     (+ indent disassemble-recursive-indent)))
+			 #'(lambda (obj)
+			     (disassemble-1
+			      obj
+			      (+ indent disassemble-recursive-indent)))
 			 arg))
 		       (t
 			;; really just a constant