Is this on the emacs-23 bzr branch?  I don't see how this error would
arise from the patch, off the top of my head.


Yes. The prototype and the definition are different. The definition has an extra param called oldval.