Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375

Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375

Remove "-face" suffix from smerge faces

2005-06-10  Miles Bader  <miles@gnu.org>

   * lisp/smerge-mode.el (smerge-mine, smerge-other, smerge-base)
   (smerge-markers): Remove "-face" suffix from face names.
   (smerge-mine-face, smerge-other-face, smerge-base-face)
   (smerge-markers-face):
   New backward-compatibility aliases for renamed faces.
   (smerge-mine-face, smerge-other-face, smerge-base-face)
   (smerge-markers-face): Use renamed smerge faces.