2 files changed, 5 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 57115bba400..d193663ed09 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-06-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * emacs-lisp/advice.el (ad-compile-function):
+        Define warning-suppress-types before we let-bind it (bug#6275).
+
         * vc-dispatcher.el: Rename mode-line-hook to vc-mode-line-hook;
         declare it, make it buffer-local and permanent-local (bug#6324).
         (vc-resynch-window): Adjust name.
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 17f2ed53ba5..9267bc8ac91 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -2684,6 +2684,8 @@ For that it has to be fbound with a non-autoload definition."
       ;; because `byte-compile' uses `fset':
       (ad-with-auto-activation-disabled
        (require 'bytecomp)
+       (require 'warnings)              ;To define warning-suppress-types
+                                        ;before we let-bind it.
        (let ((symbol (make-symbol "advice-compilation"))
              (byte-compile-warnings byte-compile-warnings)
              ;; Don't pop up windows showing byte-compiler warnings.