Make cl-locally obsolete

* doc/misc/cl.texi (Declarations): Don't document cl-locally.
* lisp/emacs-lisp/cl-macs.el (cl-locally): Make into obsolete
function alias for progn.

(cherry picked from commit 4c4f907bad1ad616dda6e5f5eec0b78ebea9f1c4)

diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index e52f642db11c16a5a3e6ccae616929071e5a22a4..4e757daab1e9bab6469276281282024ef88ee39b 100644 (file)
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -2786,10 +2786,6 @@ etc.  Currently the only declaration understood by @code{cl-declare}
 is @code{special}.
 @end defmac
 
-@defmac cl-locally declarations@dots{} forms@dots{}
-In this package, @code{cl-locally} is no different from @code{progn}.
-@end defmac
-
 @defmac cl-the type form
 @code{cl-the} returns the value of @code{form}, first checking (if
 optimization settings permit) that it is of type @code{type}.  Future

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index d59384efa60ea6d304629ad1b59d9c805d20b461..b4c1701a7998d659799714afddf0306f0806113e 100644 (file)
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2624,10 +2624,8 @@ values.  For compatibility, (cl-values A B C) is a synonym for (list A B C).
 ;;; Declarations.
 
 ;;;###autoload
-(defmacro cl-locally (&rest body)
-  "Equivalent to `progn'."
-  (declare (debug t))
-  (cons 'progn body))
+(define-obsolete-function-alias 'cl-locally #'progn "31.1")
+
 ;;;###autoload
 (defmacro cl-the (type form)
   "Return FORM.  If type-checking is enabled, assert that it is of TYPE."