master c1772ce 2/2: Declare some <package>-version variables obsolete

[Stefan Kangas]

branch: master
commit c1772ce296ae9421412b4bc4a904ef51db49376a
Author: Stefan Kangas <address@hidden>
Commit: Stefan Kangas <address@hidden>

    Declare some <package>-version variables obsolete
    
    These are not used for anything these days and can therefore be
    removed.  Package developers should check the Emacs version instead.
    Ref: https://lists.gnu.org/r/emacs-devel/2020-03/msg00080.html
    
    * 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)
    (mule-version-date):
    * lisp/linum.el (linum-version):
    * lisp/play/bubbles.el (bubbles-version):
    * lisp/speedbar.el (speedbar-version):
    * lisp/textmodes/remember.el (remember-version):
    * lisp/url/url-vars.el (url-version):
    * lisp/woman.el (woman-version): Declare obsolete.
    
    * lisp/emacs-lisp/checkdoc.el (checkdoc-start-section):
    * lisp/speedbar.el (speedbar-mode):
    * lisp/url/url-about.el (url-about-protocols):
    * lisp/url/url-http.el (url-http--user-agent-default-string):
    * lisp/url/url-news.el (url-news-fetch-message-id):
    * lisp/woman.el (woman-menu, woman-mode): Stop using variables
    declared obsolete above.
---
 lisp/calendar/icalendar.el  | 1 +
 lisp/dframe.el              | 1 +
 lisp/emacs-lisp/checkdoc.el | 3 ++-
 lisp/emulation/edt.el       | 4 +---
 lisp/international/mule.el  | 3 ++-
 lisp/linum.el               | 1 +
 lisp/play/bubbles.el        | 1 +
 lisp/speedbar.el            | 3 ++-
 lisp/textmodes/remember.el  | 1 +
 lisp/url/url-about.el       | 2 +-
 lisp/url/url-http.el        | 2 +-
 lisp/url/url-news.el        | 2 +-
 lisp/url/url-vars.el        | 1 +
 lisp/woman.el               | 3 +--
 14 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 0a4b68a..d76c110 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -107,6 +107,7 @@
 
 (defconst icalendar-version "0.19"
   "Version number of icalendar.el.")
+(make-obsolete-variable 'icalendar-version nil "28.1")
 
 ;; ======================================================================
 ;; Customizables
diff --git a/lisp/dframe.el b/lisp/dframe.el
index 2c42147..efe2bc5 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -7,6 +7,7 @@
 
 (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.
 
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 1df55e1..b5581aa 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -170,6 +170,7 @@
 ;;; 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
@@ -2642,7 +2643,7 @@ function called to create the messages."
       (goto-char (point-max))
       (let ((inhibit-read-only t))
         (insert "\n\n\C-l\n*** " label ": "
-                check-type " V " checkdoc-version)))))
+                check-type)))))
 
 (defun checkdoc-error (point msg)
   "Store POINT and MSG as errors in the checkdoc diagnostic buffer."
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 8dc18eb..e70b446 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -178,10 +178,8 @@
 (defvar edt-user-global-map)
 (defvar rect-start-point)
 
-;;;
-;;;  Version Information
-;;;
 (defconst edt-version "4.0" "EDT Emulation version number.")
+(make-obsolete-variable 'edt-version nil "28.1")
 
 ;;;
 ;;;  User Configurable Variables
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 86f3d2a..72e8cad 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -30,12 +30,13 @@
 
 ;;; Code:
 
-;; FIXME?  Are these still relevant?  Nothing uses them AFAICS.
 (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")
 
 (defconst mule-version-date "2003.9.1" "\
 Distribution date of this version of MULE (multilingual environment).")
+(make-obsolete-variable 'mule-version-date nil "28.1")
 
 
 ;;; CHARSET
diff --git a/lisp/linum.el b/lisp/linum.el
index 5efaafc..e8c3642 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -32,6 +32,7 @@
 ;;; Code:
 
 (defconst linum-version "0.9x")
+(make-obsolete-variable 'linum-version nil "28.1")
 
 (defvar linum-overlays nil "Overlays used in this buffer.")
 (defvar linum-available nil "Overlays available for reuse.")
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index 6842cb0..e598257 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -80,6 +80,7 @@
 ;;; Code:
 
 (defconst bubbles-version "0.5" "Version number of bubbles.el.")
+(make-obsolete-variable 'bubbles-version nil "28.1")
 
 (require 'gamegrid)
 
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index d8dccfa..e9c15b7 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -7,6 +7,7 @@
 
 (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)
@@ -1078,7 +1079,7 @@ in the selected file.
     (setq font-lock-keywords nil) ;; no font-locking please
     (setq truncate-lines t)
     (make-local-variable 'frame-title-format)
-    (setq frame-title-format (concat "Speedbar " speedbar-version)
+    (setq frame-title-format "Speedbar"
          case-fold-search nil
          buffer-read-only t)
     (speedbar-set-mode-line-format)
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index bc69cce..279dbb4 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -181,6 +181,7 @@
 
 (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."
diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el
index fd83ac3..59c233b 100644
--- a/lisp/url/url-about.el
+++ b/lisp/url/url-about.el
@@ -51,7 +51,7 @@
          "  <title>Supported Protocols</title>\n"
          " </head>\n"
          " <body>\n"
-         "  <h1>Supported Protocols - URL v" url-version "</h1>\n"
+          "  <h1>Supported Protocols - URL package in Emacs " emacs-version 
"</h1>\n"
          "  <table width='100%' border='1'>\n"
          "   <tr>\n"
          "    <td>Protocol\n"
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 55953c8..669c245 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -225,7 +225,7 @@ request.")
         (os-info (unless (and (listp url-privacy-level)
                               (memq 'os url-privacy-level))
                    (format "(%s; %s)" url-system-type url-os-type)))
-        (url-info (format "URL/%s" url-version)))
+        (url-info (format "URL/Emacs")))
     (string-join (delq nil (list package-info url-info
                                  emacs-info os-info))
                  " ")))
diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index d47eb02..9ef17cc 100644
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -75,7 +75,7 @@
                "  </div>\n"
                " </body>\n"
                "</html>\n"
-               "<!-- Automatically generated by URL v" url-version " -->\n"
+                "<!-- Automatically generated by URL in Emacs " emacs-version 
" -->\n"
                )))
     buf))
 
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 4e44eed..d9277cf 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -24,6 +24,7 @@
 
 (defconst url-version "Emacs"
   "Version number of URL package.")
+(make-obsolete-variable 'url-version nil "28.1")
 
 (defgroup url nil
   "Uniform Resource Locator tool."
diff --git a/lisp/woman.el b/lisp/woman.el
index 51f189a..c0e27c5 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -401,6 +401,7 @@
 ;;; Code:
 
 (defvar woman-version "0.551 (beta)" "WoMan version information.")
+(make-obsolete-variable 'woman-version nil "28.1")
 
 (require 'man)
 (require 'button)
@@ -1830,7 +1831,6 @@ Argument EVENT is the invoking mouse event."
    ["Mini Help" woman-mini-help t]
    ,@(if (fboundp 'customize-group)
         '(["Customize..." (customize-group 'woman) t]))
-   ["Show Version" (message "WoMan %s" woman-version) t]
    "--"
    ("Advanced"
     ["View Source" (view-file woman-last-file-name) woman-last-file-name]
@@ -1878,7 +1878,6 @@ Argument EVENT is the invoking mouse event."
 WoMan is an ELisp emulation of much of the functionality of the Emacs
 `man' command running the standard UN*X man and ?roff programs.
 WoMan author: address@hidden
-WoMan version: see `woman-version'.
 See `Man-mode' for additional details.
 \\{woman-mode-map}"
   (let ((Man-build-page-list (symbol-function 'Man-build-page-list))