[Emacs-commit] emacs/lisp smerge-mode.el ChangeLog

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Miles Bader <address@hidden>    05/06/10 08:48:09

Modified files:
        lisp           : smerge-mode.el ChangeLog 

Log message:
        Revision: address@hidden/emacs--cvs-trunk--0--patch-375
        
        Remove "-face" suffix from smerge faces
        
        2005-06-10  Miles Bader  <address@hidden>
        
        * 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.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/smerge-mode.el.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ChangeLog.diff?tr1=1.7718&tr2=1.7719&r1=text&r2=text