>> *Something* must be done in this situation. > Sure, it sounds like a proper merge is in order.
> That is, apply all Emacs changes since the last merge point to your > current version, and resolve any conflicts. You or some other cperl > knowledgable person can look over the changes to see if there are any > which don't make sense. cvs diff -r Ilya_5_0 lisp/progmodes/cperl-mode.el Note that a rapid glance indicates that the "cperl-foo-face => cperl-foo" conversion was probably not done quite right. Stefan _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-devel