[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/byte-opt.el [lexbind]

[Miles Bader]

Index: emacs/lisp/emacs-lisp/byte-opt.el
diff -c emacs/lisp/emacs-lisp/byte-opt.el:1.64.2.13 
emacs/lisp/emacs-lisp/byte-opt.el:1.64.2.14
*** emacs/lisp/emacs-lisp/byte-opt.el:1.64.2.13 Wed Dec  8 23:30:14 2004
--- emacs/lisp/emacs-lisp/byte-opt.el   Wed Dec  8 23:31:40 2004
***************
*** 231,246 ****
    (cons 'progn
        (mapcar
         (lambda (sexp)
!           (let ((fn (car-safe sexp)))
!             (if (and (symbolp fn)
!                   (or (cdr (assq fn byte-compile-function-environment))
!                     (and (fboundp fn)
!                       (not (or (cdr (assq fn byte-compile-macro-environment))
!                                (and (consp (setq fn (symbol-function fn)))
!                                     (eq (car fn) 'macro))
!                                (subrp fn))))))
!                 (byte-compile-inline-expand sexp)
!               sexp)))
         (cdr form))))
  
  
--- 231,246 ----
    (cons 'progn
        (mapcar
         (lambda (sexp)
!          (let ((f (car-safe sexp)))
!            (if (and (symbolp f)
!                     (or (cdr (assq f byte-compile-function-environment))
!                         (not (or (not (fboundp f))
!                                  (cdr (assq f byte-compile-macro-environment))
!                                  (and (consp (setq f (symbol-function f)))
!                                       (eq (car f) 'macro))
!                                  (subrp f)))))
!                (byte-compile-inline-expand sexp)
!              sexp)))
         (cdr form))))
  
  
***************
*** 1367,1376 ****
  ;; before each insn (or its label).
  (defun byte-decompile-bytecode-1 (bytes constvec &optional make-spliceable)
    (let ((length (length bytes))
!       (ptr 0) optr tag tags op offset
        lap tmp
!       endtag
!       (retcount 0))
      (while (not (= ptr length))
        (or make-spliceable
          (setq lap (cons ptr lap)))
--- 1367,1375 ----
  ;; before each insn (or its label).
  (defun byte-decompile-bytecode-1 (bytes constvec &optional make-spliceable)
    (let ((length (length bytes))
!       (ptr 0) optr tags op offset
        lap tmp
!       endtag)
      (while (not (= ptr length))
        (or make-spliceable
          (setq lap (cons ptr lap)))