* lisp/Makefile.in (.el.elc): Increase max-lisp-eval-depth.

* lisp/emacs-lisp/bytecomp.el (byte-compile-check-variable):
Update byte-compile-not-obsolete-var to byte-compile-not-obsolete-vars.

3 files changed, 13 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c33ed04e0c2..af456bd5d2e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/bytecomp.el (byte-compile-check-variable):
+        Update byte-compile-not-obsolete-var to byte-compile-not-obsolete-vars.
+
+        * Makefile.in (.el.elc): Increase max-lisp-eval-depth.
+
 2010-06-12  Chong Yidong  <cyd@stupidchicken.com>
 
         * term/common-win.el (x-colors): Add all the color names defined
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 25f7b89c9db..e6f2a66ec8e 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -202,7 +202,9 @@ compile-onefile:
         @echo Compiling $(THEFILE)
         @# Use byte-compile-refresh-preloaded to try and work around some of
         @# the most common bootstrapping problems.
-        @$(emacs) -l bytecomp.el -f byte-compile-refresh-preloaded $(BIG_STACK_OPTS) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $(THEFILE)
+        @$(emacs) -l bytecomp.el -f byte-compile-refresh-preloaded \
+                $(BIG_STACK_OPTS) $(BYTE_COMPILE_EXTRA_FLAGS) \
+                -f batch-byte-compile $(THEFILE)
 
 # Files MUST be compiled one by one. If we compile several files in a
 # row (i.e., in the same instance of Emacs) we can't make sure that
@@ -217,7 +219,8 @@ compile-onefile:
 # cannot have prerequisites.
 .el.elc:
         @echo Compiling $<
-        @$(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $<
+        @$(emacs) $(BIG_STACK_OPTS) $(BYTE_COMPILE_EXTRA_FLAGS) \
+                -f batch-byte-compile $<
 
 .PHONY: compile-first compile-main compile compile-always
 
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index c80bcd49b82..490d928c5a0 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -3038,7 +3038,7 @@ If BINDING is non-nil, VAR is being bound."
                               (if (symbolp var) "constant" "nonvariable")
                               (prin1-to-string var))))
         ((and (get var 'byte-obsolete-variable)
-              (not (eq var byte-compile-not-obsolete-var)))
+              (not (memq var byte-compile-not-obsolete-vars)))
          (byte-compile-warn-obsolete var))))
 
 (defsubst byte-compile-dynamic-variable-op (base-op var)