; * lisp/play/5x5.el (5x5-defvar-local): Improve obsoletion.

diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index 8fe72ddf5938b044483576e666c2f70eb6b19087..fb944f4d76a3a3172ebdc3df32a47ab351f592c3 100644 (file)
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -82,13 +82,6 @@
 
 ;; Non-customize variables.
 
-(defmacro 5x5-defvar-local (var value doc)
-  "Define VAR to VALUE with documentation DOC and make it buffer local."
-  (declare (obsolete defvar-local "28.1"))
-  `(progn
-     (defvar ,var ,value ,doc)
-     (make-variable-buffer-local (quote ,var))))
-
 (defvar-local 5x5-grid nil
   "5x5 grid contents.")
 
@@ -930,14 +923,15 @@ lest."
 
 ;; Support functions
 
-(define-obsolete-function-alias '5x5-xor 'xor "27.1")
-
 (defun 5x5-y-or-n-p (prompt)
   "5x5 wrapper for `y-or-n-p' which respects the `5x5-hassle-me' setting."
   (if 5x5-hassle-me
       (y-or-n-p prompt)
     t))
 
+(define-obsolete-function-alias '5x5-xor #'xor "27.1")
+(define-obsolete-function-alias '5x5-defvar-local #'defvar-local "28.1")
+
 (provide '5x5)
 
 ;;; 5x5.el ends here