Remove function obsolete since 22.1

* lisp/erc/erc-networks.el (erc-current-network): Remove function
obsolete since Emacs 22.1.

diff --git a/etc/NEWS b/etc/NEWS
index b3be59ec40fc65106fa1398c14a4f5117c91982b..f22801cfbef5c787ea64ba0ce34497004a3db421 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3404,9 +3404,9 @@ ledit.el, lmenu.el, lucid.el and old-whitespace.el.
 
 ---
 ** Some functions and variables obsolete since Emacs 22 have been removed:
-'gnus-article-hide-pgp-hook', 'gnus-inews-mark-gcc-as-read',
-'gnus-treat-display-xface', 'gnus-treat-strip-pgp',
-'nnmail-spool-file'.
+'erc-current-network', 'gnus-article-hide-pgp-hook',
+'gnus-inews-mark-gcc-as-read', 'gnus-treat-display-xface',
+'gnus-treat-strip-pgp', 'nnmail-spool-file'.
 
 ---
 ** The obsolete function 'thread-alive-p' has been removed.

diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el
index 54502b2df05b92897c74fc660261edd832ee31a8..ca0e90e984e83eed69dbb9ce0fb33e4819d14731 100644 (file)
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -755,15 +755,6 @@ server name and search for a match in `erc-networks-alist'."
   "Return the value of `erc-network' for the current server."
   (erc-with-server-buffer erc-network))
 
-(defun erc-current-network ()
-  "Deprecated.  Use `erc-network' instead.
-Return the name of this server's network as a symbol."
-  (erc-with-server-buffer
-    (intern (downcase (symbol-name erc-network)))))
-
-(make-obsolete 'erc-current-network 'erc-network
-               "Obsolete since erc-networks 1.5")
-
 (defun erc-network-name ()
   "Return the name of the current network as a string."
   (erc-with-server-buffer (symbol-name erc-network)))