From 04b9216b92a4ee1661e79da785cf87fc7c3a4c4e Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Fri, 15 Jul 2022 18:46:16 +0200
Subject: [PATCH] Make quickurl.el obsolete (part 2/2)

* lisp/obsolete/quickurl.el: Add "Obsolete-since" header.
* lisp/info.el (Info-file-list-for-emacs): Delete quickurl entry.
* doc/misc/autotype.texi (QuickURL): Delete section.
---
 doc/misc/autotype.texi    | 26 --------------------------
 etc/NEWS                  |  4 ++++
 lisp/info.el              |  2 +-
 lisp/obsolete/quickurl.el |  1 +
 4 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index b005c9c34f7..93c65692d01 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -92,7 +92,6 @@ completions and expansions of text at point.
 * Copyrights::             Inserting and updating copyrights.
 * Executables::            Turning interpreter scripts into executables.
 * Timestamps::             Updating dates and times in modified files.
-* QuickURL::               Inserting URLs based on text at point.
 * Tempo::                  Flexible template insertion.
 * Hippie Expand::          Expansion of text trying various methods.
 * Skeleton Language::      Making skeleton commands insert what you want.
@@ -478,31 +477,6 @@ The time stamp is written between the brackets or quotes:
 Time-stamp: <1998-02-18 10:20:51 gildea>
 @end example
 
-@node QuickURL
-@chapter QuickURL: Inserting URLs Based on Text at Point
-
-@vindex quickurl-url-file
-@findex quickurl
-@cindex URLs
-@kbd{M-x quickurl} can be used to insert a URL into a buffer based on
-the text at point.  The URLs are stored in an external file defined by
-the variable @code{quickurl-url-file} as a list of either cons cells of
-the form @code{(@var{key} . @var{URL})} or
-lists of the form @code{(@var{key} @var{URL} @var{comment})}.  These
-specify that @kbd{M-x quickurl} should insert @var{URL} if the word
-@var{key} is at point, for example:
-
-@example
-(("FSF"      "https://www.fsf.org/" "The Free Software Foundation")
- ("emacs"  . "https://www.gnu.org/software/emacs/"))
-@end example
-
-@findex quickurl-add-url
-@findex quickurl-list
-@kbd{M-x quickurl-add-url} can be used to add a new @var{key}/@var{URL}
-pair.  @kbd{M-x quickurl-list} provides interactive editing of the URL
-list.
-
 @node Tempo
 @chapter Tempo: Flexible Template Insertion
 
diff --git a/etc/NEWS b/etc/NEWS
index 8ca2e51e286..3941455efc9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -335,6 +335,10 @@ the major mode according to 'initial-major-mode', like at Emacs
 startup.  Previously, these functions ignored
 'initial-scratch-message' and left "*scratch*" in 'fundamental-mode'.
 
+---
+** The quickurl.el library is now obsolete.
+Use 'skeleton' or 'tempo' instead.
+
 ---
 ** The rlogin.el library and 'rsh' command are now obsolete.
 Use something like 'M-x shell RET ssh <host> RET' instead.
diff --git a/lisp/info.el b/lisp/info.el
index fca40512246..7c1b34ed642 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -4520,7 +4520,7 @@ Advanced commands:
     ("java" . "ccmode") ("idl" . "ccmode") ("pike" . "ccmode")
     ("skeleton" . "autotype") ("auto-insert" . "autotype")
     ("copyright" . "autotype") ("executable" . "autotype")
-    ("time-stamp" . "autotype") ("quickurl" . "autotype")
+    ("time-stamp" . "autotype")
     ("tempo" . "autotype") ("hippie-expand" . "autotype")
     ("cvs" . "pcl-cvs") ("ada" . "ada-mode") "calc"
     ("calcAlg" . "calc") ("calcDigit" . "calc") ("calcVar" . "calc")
diff --git a/lisp/obsolete/quickurl.el b/lisp/obsolete/quickurl.el
index 61cae43a88a..5ac10323d18 100644
--- a/lisp/obsolete/quickurl.el
+++ b/lisp/obsolete/quickurl.el
@@ -5,6 +5,7 @@
 ;; Author: Dave Pearson <davep@davep.org>
 ;; Created: 1999-05-28
 ;; Keywords: hypermedia
+;; Obsolete-since: 29.1
 
 ;; This file is part of GNU Emacs.
 
-- 
2.39.2