Attached is the patch I added in Mageia to fix this bug.
Something similar should be done in the emacs-23 branch.