* lisp/ChangeLog: Merge fixes.