From fdbdbc2e1bb7bc54c7c747c8520f7cc6b6baf721 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Fri, 12 Aug 2022 15:35:18 +0200
Subject: [PATCH] Make some more cedet version variables obsolete

* lisp/cedet/ede.el (ede-version):
* lisp/cedet/semantic.el (semantic-version):
* lisp/cedet/srecode.el (srecode-version): Make obsolete.
* lisp/cedet/semantic/db-file.el (semanticdb-file-version): Don't
use above obsolete variable semantic-version.
---
 lisp/cedet/ede.el              | 7 +++++--
 lisp/cedet/semantic.el         | 6 +++---
 lisp/cedet/semantic/db-file.el | 2 +-
 lisp/cedet/srecode.el          | 4 +++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 4ea14e33c5d..bcd572e21a3 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -1,6 +1,6 @@
 ;;; ede.el --- Emacs Development Environment gloss  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 1998-2005, 2007-2022 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2022 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
@@ -39,6 +39,8 @@
 ;;
 ;;  (global-ede-mode t)
 
+;;; Code:
+
 (require 'cedet)
 (require 'cl-lib)
 (require 'eieio)
@@ -66,10 +68,11 @@
 
 (defconst ede-version "2.0"
   "Current version of the Emacs EDE.")
+(make-obsolete-variable 'ede-version 'emacs-version "29.1")
 
-;;; Code:
 (defun ede-version ()
   "Display the current running version of EDE."
+  (declare (obsolete emacs-version "29.1"))
   (interactive) (message "EDE %s" ede-version))
 
 (defgroup ede nil
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 78002dd8abc..3166279de40 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -34,6 +34,8 @@
 ;; menu).  To enable it at startup, put (semantic-mode 1) in your init
 ;; file.
 
+;;; Code:
+
 (require 'cedet)
 (require 'semantic/tag)
 (require 'semantic/lex)
@@ -41,6 +43,7 @@
 
 (defvar semantic-version "2.2"
   "Current version of Semantic.")
+(make-obsolete-variable 'semantic-version 'emacs-version "29.1")
 
 (declare-function inversion-test "inversion")
 (declare-function semanticdb-load-ebrowse-caches "semantic/db-ebrowse")
@@ -73,9 +76,6 @@ introduced."
 
 (require 'semantic/fw)
 
-;;; Code:
-;;
-
 ;;; Variables and Configuration
 ;;
 (defvar-local semantic--parse-table nil
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index d00ab47ce69..e2c9d618ba2 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -29,7 +29,7 @@
 (require 'cedet-files)
 (require 'data-debug)
 
-(defvar semanticdb-file-version semantic-version
+(defvar semanticdb-file-version "2.2"
   "Version of semanticdb we are writing files to disk with.")
 (defvar semanticdb-file-incompatible-version "1.4"
   "Version of semanticdb we are not reverse compatible with.")
diff --git a/lisp/cedet/srecode.el b/lisp/cedet/srecode.el
index 7c054d4c100..9691f906a4c 100644
--- a/lisp/cedet/srecode.el
+++ b/lisp/cedet/srecode.el
@@ -37,14 +37,16 @@
 ;;
 ;; See the srecode manual for specific details.
 
+;;; Code:
+
 (require 'eieio)
 (require 'mode-local)
 (load "srecode/loaddefs" nil 'nomessage)
 
 (defvar srecode-version "1.2"
   "Current version of the Semantic Recoder.")
+(make-obsolete-variable 'srecode-version 'emacs-version "29.1")
 
-;;; Code:
 (defgroup srecode nil
   "Semantic Recoder."
   :group 'extensions
-- 
2.39.5