Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.7718 emacs/lisp/ChangeLog:1.7719
*** emacs/lisp/ChangeLog:1.7718 Fri Jun 10 08:29:58 2005
--- emacs/lisp/ChangeLog Fri Jun 10 08:48:08 2005
***************
*** 1,5 ****
--- 1,13 ----
2005-06-10 Miles Bader <[EMAIL PROTECTED]>
+ * 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):
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
