6 files changed, 31 insertions, 3 deletions
diff --git a/lisp/files.el b/lisp/files.el
index 54f2397ee37..bffdaa288a5 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3052,8 +3052,6 @@ since only a single case-insensitive search through the alist is made."
      ;; Anyway, the following extensions are supported by gfortran.
      ("\\.f9[05]\\'" . f90-mode)
      ("\\.f0[38]\\'" . f90-mode)
-     ("\\.indent\\.pro\\'" . fundamental-mode) ; to avoid idlwave-mode
-     ("\\.\\(pro\\|PRO\\)\\'" . idlwave-mode)
      ("\\.srt\\'" . srecode-template-mode)
      ("\\.prolog\\'" . prolog-mode)
      ("\\.tar\\'" . tar-mode)
diff --git a/lisp/obsolete/idlw-complete-structtag.el b/lisp/obsolete/idlw-complete-structtag.el
index bcc2ee2f005..b1e8a891c18 100644
--- a/lisp/obsolete/idlw-complete-structtag.el
+++ b/lisp/obsolete/idlw-complete-structtag.el
@@ -7,6 +7,7 @@
 ;; Old-Version: 1.2
 ;; Keywords: languages
 ;; Package: idlwave
+;; Obsolete-since: 31.1
 
 ;; This file is part of GNU Emacs.
 
@@ -25,6 +26,11 @@
 
 ;;; Commentary:
 
+;; NOTE: IDLWAVE has been moved to GNU ELPA.  The version bundled with
+;;       Emacs is out-of-date, marked as obsolete, and will be removed
+;;       in a future release.  Please use `M-x package-list' to install
+;;       IDLWAVE from GNU ELPA instead of using this version.
+
 ;; Completion of structure tags can be done automatically in the
 ;; shell, since the list of tags can be determined dynamically through
 ;; interaction with IDL.
diff --git a/lisp/obsolete/idlw-help.el b/lisp/obsolete/idlw-help.el
index c311e1c5377..3fc654407b3 100644
--- a/lisp/obsolete/idlw-help.el
+++ b/lisp/obsolete/idlw-help.el
@@ -6,6 +6,7 @@
 ;;          Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: emacs-devel@gnu.org
 ;; Package: idlwave
+;; Obsolete-since: 31.1
 
 ;; This file is part of GNU Emacs.
 
@@ -24,6 +25,11 @@
 
 ;;; Commentary:
 
+;; NOTE: IDLWAVE has been moved to GNU ELPA.  The version bundled with
+;;       Emacs is out-of-date, marked as obsolete, and will be removed
+;;       in a future release.  Please use `M-x package-list' to install
+;;       IDLWAVE from GNU ELPA instead of using this version.
+
 ;; The help link information for IDLWAVE's online help feature for
 ;; system routines is extracted automatically from the IDL
 ;; documentation, and is available, along with general routine
diff --git a/lisp/obsolete/idlw-shell.el b/lisp/obsolete/idlw-shell.el
index b5d91f46b17..2abf4b5e6dc 100644
--- a/lisp/obsolete/idlw-shell.el
+++ b/lisp/obsolete/idlw-shell.el
@@ -8,6 +8,7 @@
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: processes
 ;; Package: idlwave
+;; Obsolete-since: 31.1
 
 ;; This file is part of GNU Emacs.
 
@@ -25,7 +26,12 @@
 ;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
-;;
+
+;; NOTE: IDLWAVE has been moved to GNU ELPA.  The version bundled with
+;;       Emacs is out-of-date, marked as obsolete, and will be removed
+;;       in a future release.  Please use `M-x package-list' to install
+;;       IDLWAVE from GNU ELPA instead of using this version.
+
 ;; This mode is for IDL version 5 or later.
 ;;
 ;; Runs IDL as an inferior process of Emacs, much like the Emacs
diff --git a/lisp/obsolete/idlw-toolbar.el b/lisp/obsolete/idlw-toolbar.el
index c6cb47baa40..4e7d336ec31 100644
--- a/lisp/obsolete/idlw-toolbar.el
+++ b/lisp/obsolete/idlw-toolbar.el
@@ -6,6 +6,7 @@
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: processes
 ;; Package: idlwave
+;; Obsolete-since: 31.1
 
 ;; This file is part of GNU Emacs.
 
@@ -24,6 +25,11 @@
 
 ;;; Commentary:
 
+;; NOTE: IDLWAVE has been moved to GNU ELPA.  The version bundled with
+;;       Emacs is out-of-date, marked as obsolete, and will be removed
+;;       in a future release.  Please use `M-x package-list' to install
+;;       IDLWAVE from GNU ELPA instead of using this version.
+
 ;; This file implements a debugging toolbar for IDLWAVE.
 ;; It requires toolbar and xpm support.
 
diff --git a/lisp/obsolete/idlwave.el b/lisp/obsolete/idlwave.el
index 02d1dacd89a..b456a542d35 100644
--- a/lisp/obsolete/idlwave.el
+++ b/lisp/obsolete/idlwave.el
@@ -8,6 +8,7 @@
 ;; Maintainer: emacs-devel@gnu.org
 ;; Version: 6.1.22
 ;; Keywords: languages
+;; Obsolete-since: 31.1
 
 ;; This file is part of GNU Emacs.
 
@@ -26,6 +27,11 @@
 
 ;;; Commentary:
 
+;; NOTE: IDLWAVE has been moved to GNU ELPA.  The version bundled with
+;;       Emacs is out-of-date, marked as obsolete, and will be removed
+;;       in a future release.  Please use `M-x package-list' to install
+;;       IDLWAVE from GNU ELPA instead of using this version.
+
 ;; IDLWAVE enables feature-rich development and interaction with IDL,
 ;; the Interactive Data Language.  It provides a compelling,
 ;; full-featured alternative to the IDLDE development environment