Mercurial > emacs

diff lisp/ChangeLog @ 63205:6dde8ad3e1a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Miles Bader <miles@gnu.org>
date Fri, 10 Jun 2005 08:48:08 +0000
parents ecbe83adff58
children 2624ddc5a43f
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Jun 10 08:47:07 2005 +0000
+++ b/lisp/ChangeLog	Fri Jun 10 08:48:08 2005 +0000
@@ -1,5 +1,13 @@
 2005-06-10  Miles Bader  <miles@gnu.org>
 
+	* 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.
+
 	* log-view.el (log-view-file, log-view-message): 
 	Remove "-face" suffix from face names.
 	(log-view-file-face, log-view-message-face):