(byte-optimize-lapcode): Don't bind

unused vars.  Treat byte-constant2 like byte-constant.  Fix bogus
comparison of opcode with operand.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 017ff92aac285b4df09cbbe611d082e5f79d892c..5bc1ca906d5aab34d18c6f5aca694455e2d1cef5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-02  Dave Love  <fx@gnu.org>
+
+       * emacs-lisp/byte-opt.el (byte-optimize-lapcode): Don't bind
+       unused vars.  Treat byte-constant2 like byte-constant.  Fix bogus
+       comparison of opcode with operand.
+
 2000-10-03  Miles Bader  <miles@gnu.org>
 
        * play/yow.el (yow): Don't display multi-line quotations in a *Help*

diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index e1cc0db3f368c2a4f27b7a6c3d7ae4ac3c8266f6..c3c8e6772395baa670c9ec0a14f4d41fe5d65ece 100644 (file)
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -1415,9 +1415,9 @@
 
 (defun byte-optimize-lapcode (lap &optional for-effect)
   "Simple peephole optimizer.  LAP is both modified and returned."
-  (let (lap0 off0
-       lap1 off1
-       lap2 off2
+  (let (lap0
+       lap1
+       lap2
        (keep-going 'first-time)
        (add-depth 0)
        rest tmp tmp2 tmp3