* lisp/erc/erc-backend.el: Only require `erc' during compilation.

Fixes: debbugs:12486

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index bb8dadbbfcd6657550f9156b81ae48a026b94945..ba9dd70e88a7e6e1c8e6f040f62c1f50271db1d1 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * erc-backend.el: Only require `erc' during compilation (bug#12486).
+
 2012-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * erc-backend.el: Require `erc' instead of autoloading its macros

diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 858a6bd8e8215851da30c3811cfbcb42f47aaded..90b96d7c763bb9425a04a77f70bffe70acbe38d5 100644 (file)
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -102,8 +102,7 @@
 ;; There's a fairly strong mutual dependency between erc.el and erc-backend.el.
 ;; Luckily, erc.el does not need erc-backend.el for macroexpansion whereas the
 ;; reverse is true:
-(provide 'erc-backend)
-(require 'erc)
+(eval-when-compile (provide 'erc-backend) (require 'erc))
 
 ;;;; Variables and options