[Emacs-diffs] /srv/bzr/emacs/trunk r110580: * lisp/erc/erc-backend.el: Require `erc' instead of autoloading its macros.

[Stefan Monnier]

------------------------------------------------------------
revno: 110580
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12669
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-10-18 11:51:28 -0400
message:
  * lisp/erc/erc-backend.el: Require `erc' instead of autoloading its macros.
modified:
  lisp/erc/ChangeLog
  lisp/erc/erc-backend.el

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2012-10-18 12:49:18 +0000
+++ b/lisp/erc/ChangeLog        2012-10-18 15:51:28 +0000
@@ -1,6 +1,7 @@
 2012-10-18  Stefan Monnier  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'lisp/erc/erc-backend.el'
--- a/lisp/erc/erc-backend.el   2012-10-18 12:49:18 +0000
+++ b/lisp/erc/erc-backend.el   2012-10-18 15:51:28 +0000
@@ -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