diff options
| author | Glenn Morris | 2013-05-29 20:19:04 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-05-29 20:19:04 -0700 |
| commit | f146f2e4bdff5e381868ceead0521456e4cb76b7 (patch) | |
| tree | accccf19be65153abaac474906a5c5da8502c50a | |
| parent | 02d844b536c78abec44ecdebcec4bcdd221faba7 (diff) | |
| download | emacs-f146f2e4bdff5e381868ceead0521456e4cb76b7.tar.gz emacs-f146f2e4bdff5e381868ceead0521456e4cb76b7.zip | |
* erc/erc-backend.el: Require erc at run-time too (silences compilation)
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc-backend.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 4f5be776b09..76766144c18 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-05-30 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * erc-backend.el: Require erc at run-time too. | ||
| 4 | |||
| 1 | 2013-05-21 Glenn Morris <rgm@gnu.org> | 5 | 2013-05-21 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * erc-log.el (erc-network-name): Declare. | 7 | * erc-log.el (erc-network-name): Declare. |
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 3d3ac791f08..4200d4aff7f 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el | |||
| @@ -102,7 +102,8 @@ | |||
| 102 | ;; There's a fairly strong mutual dependency between erc.el and erc-backend.el. | 102 | ;; There's a fairly strong mutual dependency between erc.el and erc-backend.el. |
| 103 | ;; Luckily, erc.el does not need erc-backend.el for macroexpansion whereas the | 103 | ;; Luckily, erc.el does not need erc-backend.el for macroexpansion whereas the |
| 104 | ;; reverse is true: | 104 | ;; reverse is true: |
| 105 | (eval-when-compile (provide 'erc-backend) (require 'erc)) | 105 | (provide 'erc-backend) |
| 106 | (require 'erc) | ||
| 106 | 107 | ||
| 107 | ;;;; Variables and options | 108 | ;;;; Variables and options |
| 108 | 109 | ||