1.1--- a/lisp/std/defpkg.lisp	Fri Sep 13 20:30:55 2024 -0400
     1.2+++ b/lisp/std/defpkg.lisp	Sat Sep 14 22:13:06 2024 -0400
     1.3@@ -738,9 +738,7 @@
     1.4          (:export ,@pkg-externs)))))
     1.5 
     1.6 
     1.7-(defmacro with-package ((pkg) &body body)
     1.8+(defmacro with-package (pkg &body body)
     1.9   "Execute BODY within the package PKG."
    1.10-  `(let ((current (package-name *package*)))
    1.11-     (unwind-protect (progn (in-package ,pkg) ,@body)
    1.12-       (eval-when (:compile-toplevel :load-toplevel :execute)
    1.13-         (setq *package* (find-package current))))))
    1.14+  `(let ((*package* ,@(when pkg `((find-package ,pkg)))))
    1.15+     ,@body))