From bcaf5a140dd5cf15208042985f78fa1a1e0b7697 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Thu, 13 Jun 2019 14:07:12 +0200
Subject: [PATCH] Move mantemp.el to obsolete/

* lisp/progmodes/mantemp.el: Move to obsolete/. (bug#34789)
* doc/emacs/ack.texi (Acknowledgments): Remove obsolete library
mantemp.el.
---
 doc/emacs/ack.texi                      | 4 ----
 etc/TODO                                | 5 ++---
 lisp/{progmodes => obsolete}/mantemp.el | 4 ++++
 3 files changed, 6 insertions(+), 7 deletions(-)
 rename lisp/{progmodes => obsolete}/mantemp.el (98%)

diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 0e4a982da40..06e75f30773 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -502,10 +502,6 @@ expansion package.
 Tassilo Horn wrote DocView mode, allowing viewing of PDF, PostScript and
 DVI documents.
 
-@item
-Tom Houlder wrote @file{mantemp.el}, which generates manual C@t{++}
-template instantiations.
-
 @item
 Joakim Hove wrote @file{html2text.el}, a html to plain text converter.
 
diff --git a/etc/TODO b/etc/TODO
index f8c2d285eef..273455c386e 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -560,9 +560,8 @@ from the emacsclient process.
   snmp-mode [?], soundex [should be interactive?], strokes [start from
   the web page], talk, thingatpt [interactive functions?], type-break,
   vcursor, xscheme, zone-mode [?], mlconvert [?], iso-cvt,
-  feedmail [?], uce, gametree, page-ext,
-  refbib, refer, scribe, texinfo, underline,
-  cmacexp, hideif, mantemp [obsolete?], pcomplete, xml,
+  feedmail [?], uce, gametree, page-ext, refbib, refer, scribe,
+  texinfo, underline, cmacexp, hideif, pcomplete, xml,
   cvs-status (should be described in PCL-CVS manual); other progmodes,
   probably in separate manual.
 
diff --git a/lisp/progmodes/mantemp.el b/lisp/obsolete/mantemp.el
similarity index 98%
rename from lisp/progmodes/mantemp.el
rename to lisp/obsolete/mantemp.el
index 4190a847274..ad638422c2b 100644
--- a/lisp/progmodes/mantemp.el
+++ b/lisp/obsolete/mantemp.el
@@ -5,6 +5,7 @@
 ;; Author: Tom Houlder <thoulder@icor.fr>
 ;; Created: 10 Dec 1996
 ;; Keywords: g++, templates
+;; Obsolete-since: 27.1
 
 ;; This file is part of GNU Emacs.
 
@@ -23,6 +24,9 @@
 
 ;;; Commentary:
 
+;; This file is obsolete.  For more information, see:
+;; https://debbugs.gnu.org/34789
+
 ;; The following is a typical error message from g++ using STL (here
 ;; with split lines):
 ;;
-- 
2.39.5