From 0b73174177951041b433a57078e1427f24a8518a Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Sat, 16 May 2020 17:03:49 +0200
Subject: [PATCH] Declare some ancient compat aliases obsolete

* lisp/comint.el (comint-read-noecho):
* lisp/emacs-lisp/edebug.el (edebug-all-defuns):
* lisp/man.el (manual-entry):
* lisp/progmodes/inf-lisp.el (inferior-lisp-install-letter-bindings):
* lisp/info.el (Info-following-node-name):
* lisp/vc/log-edit.el (vc-log-mode-map, vc-log-entry-mode): Declare
ancient backwards-compatibility aliases and functions obsolete.  The
oldest in this list was added in 1992, and the most recent in 2004.

* lisp/net/telnet.el (telnet-initial-filter): Don't use
`comint-read-noecho'.
---
 lisp/comint.el             | 1 +
 lisp/emacs-lisp/edebug.el  | 2 +-
 lisp/info.el               | 1 +
 lisp/man.el                | 2 +-
 lisp/net/telnet.el         | 2 +-
 lisp/progmodes/inf-lisp.el | 1 +
 lisp/vc/log-edit.el        | 5 ++---
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lisp/comint.el b/lisp/comint.el
index ea06f8af87..4b3b583856 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -2350,6 +2350,7 @@ comint-bol
 
 ;; For compatibility.
 (defun comint-read-noecho (prompt &optional _ignore)
+  (declare (obsolete read-passwd "28.1"))
   (read-passwd prompt))
 
 ;; These three functions are for entering text you don't want echoed or
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 78461185d3..a565e8f6dc 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -555,7 +555,7 @@ edebug-read-top-level-form
 
 
 ;; Compatibility with old versions.
-(defalias 'edebug-all-defuns 'edebug-all-defs)
+(define-obsolete-function-alias 'edebug-all-defuns #'edebug-all-defs "28.1")
 
 ;;;###autoload
 (defun edebug-all-defs ()
diff --git a/lisp/info.el b/lisp/info.el
index d579ecc5a3..cf09003821 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2261,6 +2261,7 @@ Info-following-node-name-re
 
 ;; For compatibility; other files have used this name.
 (defun Info-following-node-name ()
+  (declare (obsolete Info-following-node-name-re "28.1"))
   (and (looking-at (Info-following-node-name-re))
        (match-string-no-properties 1)))
 
diff --git a/lisp/man.el b/lisp/man.el
index 5278a1a84d..78e35091f3 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -838,7 +838,7 @@ Man-default-man-entry
 
 ;; For compatibility with older versions.
 ;;;###autoload
-(defalias 'manual-entry 'man)
+(define-obsolete-function-alias 'manual-entry 'man "28.1")
 
 (defvar Man-completion-cache nil
   ;; On my machine, "man -k" is so fast that a cache makes no sense,
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index e8c0c1bbdf..29c415e6a6 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -149,7 +149,7 @@ telnet-initial-filter
 	    ((string-match "passw" string)
 	     (telnet-filter proc string)
 	     (setq telnet-count 0)
-	     (process-send-string proc (concat (comint-read-noecho "Password: " t)
+	     (process-send-string proc (concat (read-passwd "Password: ")
                                                telnet-new-line))
 	     (clear-this-command-keys))
 	    (t (telnet-check-software-type-initialize string)
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 9f34a377f4..7447c25fc0 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -134,6 +134,7 @@ lisp-mode-map
 ;;;  (with-eval-after-load 'inf-lisp 'inferior-lisp-install-letter-bindings)
 ;;;You can modify this function to install just the bindings you want."
 (defun inferior-lisp-install-letter-bindings ()
+  (declare (obsolete nil "28.1"))
   (define-key lisp-mode-map "\C-ce" 'lisp-eval-defun-and-go)
   (define-key lisp-mode-map "\C-cr" 'lisp-eval-region-and-go)
   (define-key lisp-mode-map "\C-cc" 'lisp-compile-defun-and-go)
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index 906f9a9420..727ec0076c 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -67,9 +67,8 @@ log-edit-mode-map
   "Keymap for the `log-edit-mode' (to edit version control log messages)."
   :group 'log-edit)
 
-;; Compatibility with old names.  Should we bother ?
-(defvar vc-log-mode-map log-edit-mode-map)
-(defvar vc-log-entry-mode vc-log-mode-map)
+(define-obsolete-variable-alias 'vc-log-mode-map 'log-edit-mode-map "28.1")
+(define-obsolete-variable-alias 'vc-log-entry-mode 'log-edit-mode-map "28.1")
 
 (easy-menu-define log-edit-menu log-edit-mode-map
   "Menu used for `log-edit-mode'."
-- 
2.26.2