* lisp/erc/erc-backend.el: Require `erc' instead of autoloading its macros.

Fixes: debbugs:12669

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index df1e74ac39f407bd0b3764d23fc0ea1db76a7c4b..bb8dadbbfcd6657550f9156b81ae48a026b94945 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,6 +1,7 @@
 2012-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-       * erc-backend.el (erc-with-server-buffer): Autoload as well (bug#12669).
+       * erc-backend.el: Require `erc' instead of autoloading its macros
+       (bug#12669).
 
 2012-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 507cff87b6b6dfaa55f936e8da5cfeb03e61921e..858a6bd8e8215851da30c3811cfbcb42f47aaded 100644 (file)
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -99,9 +99,11 @@
 
 (require 'erc-compat)
 (eval-when-compile (require 'cl))
-(autoload 'erc-with-buffer "erc" nil nil 'macro)
-(autoload 'erc-with-server-buffer "erc" nil nil 'macro)
-(autoload 'erc-log "erc")
+;; 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)
 
 ;;;; Variables and options