[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master c59dedc 1/2: Use emacs-version instead of obsolete version variab
From: |
Stefan Kangas |
Subject: |
master c59dedc 1/2: Use emacs-version instead of obsolete version variables |
Date: |
Wed, 31 Mar 2021 19:35:26 -0400 (EDT) |
branch: master
commit c59dedcdf17530d22931ec6c8f92215971af09ba
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Use emacs-version instead of obsolete version variables
* lisp/calendar/icalendar.el (icalendar-version):
* lisp/dframe.el (dframe-version):
* lisp/emacs-lisp/checkdoc.el (checkdoc-version):
* lisp/emulation/edt.el (edt-version):
* lisp/international/mule.el (mule-version):
* lisp/linum.el (linum-version):
* lisp/play/bubbles.el (bubbles-version):
* lisp/textmodes/remember.el (remember-version):
* lisp/url/url-vars.el (url-version):
* lisp/woman.el (woman-version): Use emacs-version instead of obsolete
version variables.
---
lisp/calendar/icalendar.el | 9 +++++----
lisp/dframe.el | 2 +-
lisp/emacs-lisp/checkdoc.el | 9 ++++++---
lisp/emulation/edt.el | 6 +++---
lisp/international/mule.el | 2 +-
lisp/linum.el | 6 +++---
lisp/play/bubbles.el | 8 +++++---
lisp/textmodes/remember.el | 9 +++++----
lisp/url/url-vars.el | 9 +++++----
lisp/woman.el | 8 +++++---
10 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index d9cd21e..04b525e 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -105,10 +105,6 @@
;;; Code:
-(defconst icalendar-version "0.19"
- "Version number of icalendar.el.")
-(make-obsolete-variable 'icalendar-version nil "28.1")
-
;; ======================================================================
;; Customizables
;; ======================================================================
@@ -2557,6 +2553,11 @@ the entry."
(or (icalendar--get-event-property event 'URL) "")
(or (icalendar--get-event-property event 'CLASS) "")))
+;; Obsolete
+
+(defconst icalendar-version "0.19" "Version number of icalendar.el.")
+(make-obsolete-variable 'icalendar-version 'emacs-version "28.1")
+
(provide 'icalendar)
;;; icalendar.el ends here
diff --git a/lisp/dframe.el b/lisp/dframe.el
index e61d2ea..f4208f3 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -828,7 +828,7 @@ the mode-line."
(defvar dframe-version "1.3"
"The current version of the dedicated frame library.")
-(make-obsolete-variable 'dframe-version nil "28.1")
+(make-obsolete-variable 'dframe-version 'emacs-version "28.1")
(provide 'dframe)
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 6285166..96b16f7 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -160,9 +160,6 @@
;; not specifically docstring related. Would this even be useful?
;;; Code:
-(defvar checkdoc-version "0.6.2"
- "Release version of checkdoc you are currently running.")
-(make-obsolete-variable 'checkdoc-version nil "28.1")
(require 'cl-lib)
(require 'help-mode) ;; for help-xref-info-regexp
@@ -2709,6 +2706,12 @@ function called to create the messages."
(custom-add-option 'emacs-lisp-mode-hook 'checkdoc-minor-mode)
+;; Obsolete
+
+(defvar checkdoc-version "0.6.2"
+ "Release version of checkdoc you are currently running.")
+(make-obsolete-variable 'checkdoc-version 'emacs-version "28.1")
+
(provide 'checkdoc)
;;; checkdoc.el ends here
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 50979c4..f11afb1 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -178,9 +178,6 @@
(defvar edt-user-global-map)
(defvar rect-start-point)
-(defconst edt-version "4.0" "EDT Emulation version number.")
-(make-obsolete-variable 'edt-version nil "28.1")
-
;;;
;;; User Configurable Variables
;;;
@@ -2533,6 +2530,9 @@ G-C-\\: Split Window | FNDNXT |
Yank | CUT |
(set-frame-width nil 132)
(message "Terminal width 132"))
+(defconst edt-version "4.0" "EDT Emulation version number.")
+(make-obsolete-variable 'edt-version 'emacs-version "28.1")
+
(provide 'edt)
;;; edt.el ends here
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 52e743e..83cbb44 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -32,7 +32,7 @@
(defconst mule-version "6.0 (HANACHIRUSATO)" "\
Version number and name of this version of MULE (multilingual environment).")
-(make-obsolete-variable 'mule-version nil "28.1")
+(make-obsolete-variable 'mule-version 'emacs-version "28.1")
(defconst mule-version-date "2003.9.1" "\
Distribution date of this version of MULE (multilingual environment).")
diff --git a/lisp/linum.el b/lisp/linum.el
index f9761d2..b0281d3 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -31,9 +31,6 @@
;;; Code:
-(defconst linum-version "0.9x")
-(make-obsolete-variable 'linum-version nil "28.1")
-
(defvar-local linum-overlays nil "Overlays used in this buffer.")
(defvar-local linum-available nil "Overlays available for reuse.")
(defvar linum-before-numbering-hook nil
@@ -244,6 +241,9 @@ Linum mode is a buffer-local minor mode."
;; continue standard unloading
nil)
+(defconst linum-version "0.9x")
+(make-obsolete-variable 'linum-version 'emacs-version "28.1")
+
(provide 'linum)
;;; linum.el ends here
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index 50f65a1..e695a75 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -72,9 +72,6 @@
;;; Code:
-(defconst bubbles-version "0.5" "Version number of bubbles.el.")
-(make-obsolete-variable 'bubbles-version nil "28.1")
-
(require 'gamegrid)
;; User options
@@ -1405,6 +1402,11 @@ Return t if new char is non-empty."
(forward-char 1)))
(put-text-property (point-min) (point-max) 'pointer 'arrow)))))
+;; Obsolete.
+
+(defconst bubbles-version "0.5" "Version number of bubbles.el.")
+(make-obsolete-variable 'bubbles-version 'emacs-version "28.1")
+
(provide 'bubbles)
;;; bubbles.el ends here
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 3affb46..cd76bf8 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -178,10 +178,6 @@
;;; Code:
-(defconst remember-version "2.0"
- "This version of remember.")
-(make-obsolete-variable 'remember-version nil "28.1")
-
(defgroup remember nil
"A mode to remember information."
:group 'data)
@@ -671,6 +667,11 @@ is non-nil, bury it and return nil; otherwise return t."
nil)
t))
+;; Obsolete
+
+(defconst remember-version "2.0" "This version of remember.")
+(make-obsolete-variable 'remember-version 'emacs-version "28.1")
+
(provide 'remember)
;;; remember.el ends here
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 8c836f8..2aa2e79 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -22,10 +22,6 @@
;;; Code:
-(defconst url-version "Emacs"
- "Version number of URL package.")
-(make-obsolete-variable 'url-version nil "28.1")
-
(defgroup url nil
"Uniform Resource Locator tool."
:version "22.1"
@@ -427,6 +423,11 @@ Should be one of:
This should be set, e.g. by mail user agents rendering HTML to avoid
`bugs' which call home.")
+;; Obsolete
+
+(defconst url-version "Emacs" "Version number of URL package.")
+(make-obsolete-variable 'url-version 'emacs-version "28.1")
+
(provide 'url-vars)
;;; url-vars.el ends here
diff --git a/lisp/woman.el b/lisp/woman.el
index 505fdb4..d9aa573 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -390,9 +390,6 @@
(eval-when-compile (require 'cl-lib))
-(defvar woman-version "0.551 (beta)" "WoMan version information.")
-(make-obsolete-variable 'woman-version nil "28.1")
-
(require 'man)
(define-button-type 'WoMan-xref-man-page
:supertype 'Man-abstract-xref-man-page
@@ -4580,6 +4577,11 @@ logging the message."
(bookmark-default-handler
`("" (buffer . ,buf) . ,(bookmark-get-bookmark-record bookmark)))))
+;; Obsolete.
+
+(defvar woman-version "0.551 (beta)" "WoMan version information.")
+(make-obsolete-variable 'woman-version 'emacs-version "28.1")
+
(provide 'woman)
;;; woman.el ends here