From: Stefan Kangas <stefankangas@gmail.com>
Date: Sat, 22 Mar 2025 06:01:14 +0000 (+0100)
Subject: Make 'eieio-version' obsolete
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f7bcd59d02e1d6c65cbfac67e5334ac94a7794b;p=emacs.git

Make 'eieio-version' obsolete

EIEIO used to be developed externally as part of CEDET, but that is no
longer the case.  It now has the same version as Emacs itself.
https://sourceforge.net/p/cedet/git/ci/8aa920380f8178ed2514f06f13c403d80db16752/

* lisp/emacs-lisp/eieio.el: Change "Version" header to "Old-Version".
(eieio-version): Make both the variable and the function obsolete in
favor of 'emacs-version'.

(cherry picked from commit 580c050f6dd41eea718f9414efeabcae43cdb625)
---

diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 6db7f26bbc2..483234f9434 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -1,10 +1,10 @@
 ;;; eieio.el --- Enhanced Implementation of Emacs Interpreted Objects  -*- lexical-binding:t -*-
 ;;;              or maybe Eric's Implementation of Emacs Interpreted Objects
 
-;; Copyright (C) 1995-1996, 1998-2025 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2025 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
-;; Version: 1.4
+;; Old-Version: 1.4
 ;; Keywords: OO, lisp
 
 ;; This file is part of GNU Emacs.
@@ -44,14 +44,6 @@
 
 ;;; Code:
 
-(defvar eieio-version "1.4"
-  "Current version of EIEIO.")
-
-(defun eieio-version ()
-  "Display the current version of EIEIO."
-  (interactive)
-  (message eieio-version))
-
 (require 'eieio-core)
 (eval-when-compile (require 'subr-x))
 
@@ -1004,6 +996,19 @@ of `eq'."
   (error "EIEIO: `change-class' is unimplemented"))
 (define-obsolete-function-alias 'change-class #'eieio-change-class "26.1")
 
+
+;;; Obsolete
+;;
+(make-obsolete-variable 'eieio-version 'emacs-version "31.1")
+(defvar eieio-version "1.4"
+  "Current version of EIEIO.")
+
+(defun eieio-version ()
+  "Display the current version of EIEIO."
+  (declare (obsolete emacs-version "31.1"))
+  (interactive)
+  (message eieio-version))
+
 (provide 'eieio)
 
 ;;; eieio.el ends here