diff options
| author | Kenichi Handa | 2012-09-30 23:39:46 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-09-30 23:39:46 +0900 |
| commit | c194970e15b6d6efa07697679a25dfab3aa76442 (patch) | |
| tree | 49aec8be9d2dcc74ad3c81f562e48308d8e27b75 /lisp/erc | |
| parent | 95402d5faa114a311cabfb8c64cf22a93787a066 (diff) | |
| parent | dd946752ab8810149a66a3eff469eb128709972d (diff) | |
| download | emacs-c194970e15b6d6efa07697679a25dfab3aa76442.tar.gz emacs-c194970e15b6d6efa07697679a25dfab3aa76442.zip | |
merge trunk
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 674a6c97eec..348765036ea 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-09-25 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * erc.el (erc-send-command): Use define-obsolete-function-alias. | ||
| 4 | |||
| 1 | 2012-09-17 Chong Yidong <cyd@gnu.org> | 5 | 2012-09-17 Chong Yidong <cyd@gnu.org> |
| 2 | 6 | ||
| 3 | * erc-page.el (erc-page-function): | 7 | * erc-page.el (erc-page-function): |
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index feef75940f3..7feadc50aca 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el | |||
| @@ -139,8 +139,8 @@ | |||
| 139 | (message (concat "ERC: The function `defvaralias' is not bound. See the " | 139 | (message (concat "ERC: The function `defvaralias' is not bound. See the " |
| 140 | "NEWS file for variable name changes since ERC 5.0.4."))) | 140 | "NEWS file for variable name changes since ERC 5.0.4."))) |
| 141 | 141 | ||
| 142 | (defalias 'erc-send-command 'erc-server-send) | 142 | (define-obsolete-function-alias 'erc-send-command |
| 143 | (erc-make-obsolete 'erc-send-command 'erc-server-send "ERC 5.1") | 143 | 'erc-server-send "ERC 5.1") |
| 144 | 144 | ||
| 145 | ;; tunable connection and authentication parameters | 145 | ;; tunable connection and authentication parameters |
| 146 | 146 | ||