Subject: Fix arguments for make-obsolete and make-obsolete-variable
Origin: backport, https://github.com/wanderlust/wanderlust/commit/a08b051b78736f9779ac576258e8811c23494386

    Drop old platforms support. Now supported Emacsen are version 24 and later.

diff --git a/elmo/elmo-date.el b/elmo/elmo-date.el
index 73ddf54..594edbb 100644
--- a/elmo/elmo-date.el
+++ b/elmo/elmo-date.el
@@ -35,8 +35,7 @@
 (require 'elmo-vars)
 (eval-when-compile (require 'cl))
 
-;; 2012-08-26
-(make-obsolete 'elmo-match-string 'match-string)
+(make-obsolete 'elmo-match-string 'match-string "26 Aug 2012")
 
 (defmacro elmo-match-buffer (pos)
   "Substring POSth matched from the current buffer."
diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 9179108..7f3d817 100644
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -1205,8 +1205,7 @@ MESSAGE is a doing part of progress message."
     (and value
 	 (std11-unfold-string value))))
 
-;; 2012-07-30
-(make-obsolete 'elmo-unfold-field-body 'elmo-unfold-fetch-field)
+(make-obsolete 'elmo-unfold-field-body 'elmo-unfold-fetch-field "30 Jul 2012")
 
 (defun elmo-decoded-fetch-field (field-name &optional mode)
   (let ((field-body (std11-fetch-field field-name)))
@@ -1216,8 +1215,8 @@ MESSAGE is a doing part of progress message."
 		(mime-decode-field-body field-body field-name mode)))
 	     field-body))))
 
-;; 2012-07-30
-(make-obsolete 'elmo-decoded-field-body 'elmo-decoded-fetch-field)
+(make-obsolete
+ 'elmo-decoded-field-body 'elmo-decoded-fetch-field "30 Jul 2012")
 
 (defun elmo-address-quote-specials (word)
   "Make quoted string of WORD if needed."
diff --git a/elmo/elmo-version.el b/elmo/elmo-version.el
index 6aa7fbb..d36529f 100644
--- a/elmo/elmo-version.el
+++ b/elmo/elmo-version.el
@@ -54,11 +54,12 @@
 (defconst elmo-appname (product-name (product-find 'elmo-version)))
 (make-obsolete-variable
  'elmo-appname
- "use (product-name (product-find 'elmo-version)) instead.")
+ "use (product-name (product-find 'elmo-version)) instead." "10 Oct 2000")
 
 (defconst elmo-version (product-version-string (product-find 'elmo-version)))
 (make-obsolete-variable
  'elmo-version
- "use (product-version-string (product-find 'elmo-version)) instead.")
+ "use (product-version-string (product-find 'elmo-version)) instead."
+ "10 Oct 2000")
 
 ;;; elmo-version.el ends here
diff --git a/elmo/elmo.el b/elmo/elmo.el
index 05f312c..d52425b 100644
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -1936,10 +1936,9 @@ A value in this structure is cached at first access."
 
 
 ;; Obsolete functions.
-;; 2001-12-11: *-dir -> *-directory
 (defalias 'elmo-folder-make-temp-dir 'elmo-folder-make-temporary-directory)
 (make-obsolete 'elmo-folder-make-temp-dir
-	       'elmo-folder-make-temporary-directory)
+	       'elmo-folder-make-temporary-directory "11 Dec 2001")
 
 (require 'product)
 (product-provide (provide 'elmo) (require 'elmo-version))
diff --git a/elmo/pldap.el b/elmo/pldap.el
index fa43584..21ae429 100644
--- a/elmo/pldap.el
+++ b/elmo/pldap.el
@@ -891,7 +891,7 @@ Otherwise, invoke `ldap-search-entries'.  ARGS are passed to each function."
 
 (make-obsolete 'ldap-search
 	       "Use `ldap-search-entries' instead or
-`ldap-search-basic' for the low-level search API.")
+`ldap-search-basic' for the low-level search API." "15 Jun 2000 at latest")
 
 (defun ldap-search-entries (filter &optional host attributes attrsonly withdn)
   "Perform an LDAP search.
diff --git a/wl/wl-util.el b/wl/wl-util.el
index faf6588..74c84bf 100644
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -53,7 +53,7 @@
   (defalias-maybe 'dispatch-event 'ignore))
 
 (defalias 'wl-set-work-buf 'elmo-set-work-buf)
-(make-obsolete 'wl-set-work-buf 'elmo-set-work-buf)
+(make-obsolete 'wl-set-work-buf 'elmo-set-work-buf "03 Apr 2000 at latest")
 
 (defmacro wl-append (val func)
   (list 'if val
@@ -61,7 +61,7 @@
     (list 'setq val func)))
 
 (defalias 'wl-parse 'elmo-parse)
-(make-obsolete 'wl-parse 'elmo-parse)
+(make-obsolete 'wl-parse 'elmo-parse "20 Feb 2001")
 
 (defun wl-delete-duplicates (list &optional all hack-addresses)
   "Delete duplicate equivalent strings from the LIST.
@@ -218,7 +218,7 @@ even when invalid character is contained."
 	(force-mode-line-update t)))))
 
 (defalias 'wl-display-error 'elmo-display-error)
-(make-obsolete 'wl-display-error 'elmo-display-error)
+(make-obsolete 'wl-display-error 'elmo-display-error "03 Apr 2000 at latest")
 
 (defun wl-get-assoc-list-value (assoc-list folder &optional match)
   (catch 'found
@@ -240,11 +240,9 @@ even when invalid character is contained."
 	(setq alist (cdr alist)))
       value)))
 
-;; 2017-12-11
-(make-obsolete 'wl-match-string 'match-string)
+(make-obsolete 'wl-match-string 'match-string"11 Dec 2017")
 
-;; 2017-12-11
-(make-obsolete 'wl-match-buffer 'elmo-match-buffer)
+(make-obsolete 'wl-match-buffer 'elmo-match-buffer "11 Dec 2017")
 
 (put 'wl-as-coding-system 'lisp-indent-function 1)
 (put 'wl-as-mime-charset 'lisp-indent-function 1)
@@ -270,7 +268,7 @@ even when invalid character is contained."
      ,@body))
 
 (defalias 'wl-string 'elmo-string)
-(make-obsolete 'wl-string 'elmo-string)
+(make-obsolete 'wl-string 'elmo-string "03 Apr 2000 at latest")
 
 (if (not (fboundp 'overlays-in))
     (defun overlays-in (beg end)
@@ -909,11 +907,9 @@ that `read' can handle, whenever this is possible."
 	    (setq wl-biff-check-folders-running nil))))
     (setq wl-biff-check-folders-running nil)))
 
-;; 2016-09-22
-(make-obsolete 'wl-expand-newtext 'elmo-expand-newtext)
+(make-obsolete 'wl-expand-newtext 'elmo-expand-newtext "22 Sep 2016")
 
-;; 2016-09-22
-(make-obsolete 'wl-regexp-opt 'elmo-regexp-opt)
+(make-obsolete 'wl-regexp-opt 'elmo-regexp-opt "22 Sep 2016")
 
 (defun wl-region-exists-p ()
   "Return non-nil if a region exists on current buffer."
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 2466137..12373bb 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -3273,10 +3273,9 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format."
 (elmo-define-obsolete-variable 'wl-summary-temp-above
 			       'wl-summary-target-above)
 
-;; 1999-11-07: Unified with `wl-draft-config-alist'.
 (defvar wl-draft-prepared-config-alist nil)
 (make-obsolete-variable 'wl-draft-prepared-config-alist
-			'wl-draft-config-alist)
+			'wl-draft-config-alist "07 Nov 1999")
 
 ;; 1999-10-10
 (elmo-define-obsolete-variable 'wl-address-filename
diff --git a/wl/wl-version.el b/wl/wl-version.el
index 4f0bf5a..9514383 100644
--- a/wl/wl-version.el
+++ b/wl/wl-version.el
@@ -189,16 +189,17 @@ Separate DELIMITER (default is \" \").  If WITH-CODENAME add XEmacs codename."
 (defconst wl-appname (product-name (product-find 'wl-version)))
 (make-obsolete-variable
  'wl-appname
- "use (product-name (product-find 'wl-version)) insteaed.")
+ "use (product-name (product-find 'wl-version)) insteaed." "10 Oct 2000")
 
 (defconst wl-version (product-version-string (product-find 'wl-version)))
 (make-obsolete-variable
  'wl-version
- "use (product-version-string (product-find 'wl-version)) instead.")
+ "use (product-version-string (product-find 'wl-version)) instead."
+ "10 Oct 2000")
 
 (defconst wl-codename (product-code-name (product-find 'wl-version)))
 (make-obsolete-variable
  'wl-codename
- "use (product-code-name (product-find 'wl-version)) instead.")
+ "use (product-code-name (product-find 'wl-version)) instead." "10 Oct 2000")
 
 ;;; wl-version.el ends here