final review of fix for #25552

[Mike K. <mk...@al...>]

Attached is the proposed final patch to fix the cl problem (#25552).
The Lisp is the same as before.  What's new are the git comments
(ChangeLog format, plus author attribution and a reference to the bug
number).

I'd very much appreciate it if someone could double-check that I got the
git comments right, especially making sure they accurately describe the
Lisp changes.  (Any other suggestions for improvements are welcome,
too.)

thanks,
mike