Stefan Monnier <monnier@IRO.UMontreal.CA> writes:

>> Fair enough, though it's looking like the simplest solution is to keep
>> the original (when (file-directory-p dir) ...) check and avoid cl-lib
>> altogether.
>
> Agreed, with a comment explaining that cl-lib macros can't be used at
> this point for bootstrap reasons.

How's the attached (see [PATCH 3/8])?  Too verbose?

P.S. I have been informed off-list by a fellow emacs-devel subscriber
     that multiple copies of some of my emails are being repeatedly
     delivered to them.  Has anyone else experienced this?  If so, any
     advice on how to fix this would be much appreciated.
     Sorry in advance.

Thanks,

-- 
Basil