Unobsolete erc-compat.el

* lisp/obsolete/erc-compat.el: Move from here...
* lisp/erc/erc-compat.el: ...back to here.  ERC will soon be added to
GNU ELPA, and erc-compat.el will be used to provide compatibility
functions and/or variables for using ERC on older Emacsen.
* etc/NEWS: Remove the previously added obsoletion news item.

2 files changed, 1 insertions, 7 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 15614da7421..6d039bac4a8 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2818,11 +2818,6 @@ Allowed inputs are seconds or ISO8601-like periods like "1h" or "4h30m".
 Italic text is displayed in the new 'erc-italic-face'.
 
 ---
-*** The erc-compat.el library is now marked obsolete.
-This file contained ERC compatibility code for Emacs 21 and XEmacs
-which is no longer needed.
-
----
 *** erc-match.el now supports 'message' highlight type (not including the nick).
 The 'erc-current-nick-highlight-type', 'erc-pal-highlight-type',
 'erc-fool-highlight-type', 'erc-keyword-highlight-type', and
diff --git a/lisp/obsolete/erc-compat.el b/lisp/erc/erc-compat.el
index ef47ab793a7..6b1da2f9054 100644
--- a/lisp/obsolete/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -1,11 +1,10 @@
-;;; erc-compat.el --- ERC compatibility code for XEmacs  -*- lexical-binding: t; -*-
+;;; erc-compat.el --- ERC compatibility code for older Emacsen  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2002-2003, 2005-2021 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Amin Bandali <bandali@gnu.org>
 ;; URL: https://www.emacswiki.org/emacs/ERC
-;; Obsolete-since: 28.1
 
 ;; This file is part of GNU Emacs.