some order into special vars

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index fa3f5a7f9b9b6fb12d2a4c7f2edc1ece0ea6a753..ca7c67e6907a0be848ae0b421801493d258908e3 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -560,10 +560,13 @@ outputting warnings about functions not being defined at runtime.")
 (defvar byte-compile-output nil
   "Alist describing contents to put in byte code string.
 Each element is (INDEX . VALUE)")
-(defvar byte-compile-lap-output nil)
 (defvar byte-compile-depth 0 "Current depth of execution stack.")
 (defvar byte-compile-maxdepth 0 "Maximum depth of execution stack.")
 
+;; These are use by comp.el to spill lap
+(defvar byte-compile-spilling-lap nil)
+(defvar byte-compile-lap-output nil)
+
 \f
 ;;; The byte codes; this information is duplicated in bytecomp.c
 

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 23cf7317d2e76df6f1084745d9d4413ea771212d..6d9ff8d51565a283265da4dc84055f4668b8e147 100644 (file)
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -47,7 +47,6 @@
 
 ;; FIXME these has to be removed
 (defvar comp-speed 2)
-(defvar byte-compile-lap-output)
 
 (defvar comp-pass nil
   "Every pass has the right to bind what it likes here.")