From: Stefan Kangas <stefan@marxist.se>
Date: Wed, 15 Sep 2021 21:13:32 +0000 (+0200)
Subject: Remove function obsolete since 22.1
X-Git-Tag: emacs-28.0.90~940
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e709412c2d6f5793ad800372fbd573f7e9ada8ec;p=emacs.git

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 b3be59ec40f..f22801cfbef 100644
--- 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 54502b2df05..ca0e90e984e 100644
--- 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)))