From: Stefan Kangas <stefan@marxist.se>
Date: Mon, 1 Feb 2021 15:03:10 +0000 (+0100)
Subject: ; Move obsolete version variables further down
X-Git-Tag: emacs-28.0.90~3974
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=78744f5168f7dd19f742684afd9c588a4a1e688d;p=emacs.git

; Move obsolete version variables further down

* lisp/dframe.el:
* lisp/speedbar.el: Move obsolete variables from the top of the file
to the bottom, where they don't obscure the license information.
---

diff --git a/lisp/dframe.el b/lisp/dframe.el
index 23cb6c5a920..7ea5b3364e8 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -5,10 +5,6 @@
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
 
-(defvar dframe-version "1.3"
-  "The current version of the dedicated frame library.")
-(make-obsolete-variable 'dframe-version nil "28.1")
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
@@ -834,6 +830,13 @@ the mode-line."
 	  (t (dframe-message
 	      "Click on the edge of the mode line to scroll left/right")))))
 
+
+;;; Obsolete
+
+(defvar dframe-version "1.3"
+  "The current version of the dedicated frame library.")
+(make-obsolete-variable 'dframe-version nil "28.1")
+
 (provide 'dframe)
 
 ;;; dframe.el ends here
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 7f751ec3476..e43978f4137 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -5,15 +5,6 @@
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
 
-(defvar speedbar-version "1.0"
-  "The current version of speedbar.")
-(make-obsolete-variable 'speedbar-version nil "28.1")
-(defvar speedbar-incompatible-version "0.14beta4"
-  "This version of speedbar is incompatible with this version.
-Due to massive API changes (removing the use of the word PATH)
-this version is not backward compatible to 0.14 or earlier.")
-(make-obsolete-variable 'speedbar-incompatible-version nil "28.1")
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
@@ -4086,6 +4077,19 @@ See `speedbar-expand-image-button-alist' for details."
 	    (insert (car (car ia)) "\t" (format "%s" (cdr (car ia))) "\n"))
 	  (setq ia (cdr ia)))))))
 
+
+;; Obsolete
+
+(defvar speedbar-version "1.0"
+  "The current version of speedbar.")
+(make-obsolete-variable 'speedbar-version 'emacs-version "28.1")
+
+(defvar speedbar-incompatible-version "0.14beta4"
+  "This version of speedbar is incompatible with this version.
+Due to massive API changes (removing the use of the word PATH)
+this version is not backward compatible to 0.14 or earlier.")
+(make-obsolete-variable 'speedbar-incompatible-version nil "28.1")
+
 
 (provide 'speedbar)