>
> This one seems to include the last change to x-dnd.el.
>

Gosh!  After including too little, I included too much.  The attached one 
is correct (I hope).