> You installed the sources originally and they've not been updated since;The sources I installed weren't 100% identical, IIRC (some adjustments
in the copyright headers, probably). So that needs to be synchronized.
The problem is not just to merge the changes made on both sides, but to
> is there anything to be done?
keep the GNU ELPA package uptodate. If the development takes place in
`elpa', then it comes for free.