From 0e4a2dca836b52740ead29d5ff6436d938d17a78 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Mon, 8 Mar 2021 05:09:27 +0100
Subject: [PATCH] Normalize version specifiers for make-obsolete and friends

* lisp/auth-source.el (auth-source-forget-user-or-password)
(auth-source-user-or-password, auth-source-hide-passwords):
* lisp/calendar/icalendar.el (icalendar--datetime-to-noneuropean-date):
* lisp/cedet/semantic/db-el.el (semanticdb-elisp-sym-function-arglist):
* lisp/emacs-lisp/debug.el (debugger-insert-backtrace):
* lisp/obsolete/nnir.el (nnir-swish-e-index-file):
* lisp/obsolete/starttls.el (starttls-any-program-available):
Normalize version specifiers for make-obsolete and friends.
---
 lisp/auth-source.el          | 6 +++---
 lisp/calendar/icalendar.el   | 2 +-
 lisp/cedet/semantic/db-el.el | 6 +++---
 lisp/emacs-lisp/debug.el     | 2 +-
 lisp/obsolete/nnir.el        | 2 +-
 lisp/obsolete/starttls.el    | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 14cae8a52c7..2516b4b9fae 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -162,7 +162,7 @@ let-binding."
 (defvar auth-source-creation-prompts nil
   "Default prompts for token values.  Usually let-bound.")
 
-(make-obsolete 'auth-source-hide-passwords nil "Emacs 24.1")
+(make-obsolete 'auth-source-hide-passwords nil "24.1")
 
 (defcustom auth-source-save-behavior 'ask
   "If set, auth-source will respect it for save behavior."
@@ -2307,9 +2307,9 @@ See `auth-source-search' for details on SPEC."
 
 ;; deprecate the old interface
 (make-obsolete 'auth-source-user-or-password
-               'auth-source-search "Emacs 24.1")
+               'auth-source-search "24.1")
 (make-obsolete 'auth-source-forget-user-or-password
-               'auth-source-forget "Emacs 24.1")
+               'auth-source-forget "24.1")
 
 (defun auth-source-user-or-password
   (mode host port &optional username create-missing delete-existing)
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index dafdd418d0d..0b6ff560424 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -774,7 +774,7 @@ American format: \"month day year\"."
     nil))
 
 (define-obsolete-function-alias 'icalendar--datetime-to-noneuropean-date
-  'icalendar--datetime-to-american-date "icalendar 0.19")
+  'icalendar--datetime-to-american-date "23.1")
 
 (defun icalendar--datetime-to-european-date (datetime &optional separator)
   "Convert the decoded DATETIME to European format.
diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index 4699e722c1a..de84b978026 100644
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -195,9 +195,6 @@ If Emacs cannot resolve this symbol to a particular file, then return nil."
 	(when tab (cons tab match))))))
 
 (autoload 'help-function-arglist "help-fns")
-(defalias 'semanticdb-elisp-sym-function-arglist 'help-function-arglist)
-(make-obsolete 'semanticdb-elisp-sym-function-arglist
-	       'help-function-arglist "CEDET 1.1")
 
 (defun semanticdb-elisp-sym->tag (sym &optional toktype)
   "Convert SYM into a semantic tag.
@@ -347,6 +344,9 @@ Return a list of tags."
 	     )
 	taglst))))
 
+(define-obsolete-function-alias 'semanticdb-elisp-sym-function-arglist
+  #'help-function-arglist "24.3")
+
 (provide 'semantic/db-el)
 
 ;;; semantic/db-el.el ends here
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index d9da0db4551..b2d54c77feb 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -321,7 +321,7 @@ the debugger will not be entered."
 
 (make-obsolete 'debugger-insert-backtrace
                "use a `backtrace-mode' buffer or `backtrace-to-string'."
-               "Emacs 27.1")
+               "27.1")
 
 (defun debugger-insert-backtrace (frames do-xrefs)
   "Format and insert the backtrace FRAMES at point.
diff --git a/lisp/obsolete/nnir.el b/lisp/obsolete/nnir.el
index 337d83ccca1..7d7e88184c4 100644
--- a/lisp/obsolete/nnir.el
+++ b/lisp/obsolete/nnir.el
@@ -279,7 +279,7 @@ that it is for swish++, not Namazu."
 ;; `nnir-swish-e-additional-switches'
 
 (make-obsolete-variable 'nnir-swish-e-index-file
-			'nnir-swish-e-index-files "Emacs 23.1")
+                        'nnir-swish-e-index-files "23.1")
 (defcustom nnir-swish-e-index-file
   (expand-file-name "~/Mail/index.swish-e")
   "Index file for swish-e.
diff --git a/lisp/obsolete/starttls.el b/lisp/obsolete/starttls.el
index 0ca486324fd..926248db9af 100644
--- a/lisp/obsolete/starttls.el
+++ b/lisp/obsolete/starttls.el
@@ -288,7 +288,7 @@ GnuTLS requires a port number."
 			  starttls-program))))
 
 (define-obsolete-function-alias 'starttls-any-program-available
-  #'starttls-available-p "2011-08-02")
+  #'starttls-available-p "24.1")
 
 (provide 'starttls)
 
-- 
2.39.5