From 393e94faab632affef628462753d2e5587a274b1 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 18 Oct 2012 11:51:28 -0400 Subject: [PATCH] * lisp/erc/erc-backend.el: Require `erc' instead of autoloading its macros. Fixes: debbugs:12669 --- lisp/erc/ChangeLog | 3 ++- lisp/erc/erc-backend.el | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index df1e74ac39f..bb8dadbbfcd 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,6 +1,7 @@ 2012-10-18 Stefan Monnier - * 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 diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 507cff87b6b..858a6bd8e82 100644 --- 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 -- 2.39.2