Mercurial > emacs
diff lisp/smerge-mode.el @ 104778:afa0e028ba97
Mark face aliases with "-face" suffix as obsolete.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Tue, 01 Sep 2009 07:24:13 +0000 |
parents | 1d5d501c3c03 |
children | 98356e8ba345 |
line wrap: on
line diff
--- a/lisp/smerge-mode.el Tue Sep 01 03:27:52 2009 +0000 +++ b/lisp/smerge-mode.el Tue Sep 01 07:24:13 2009 +0000 @@ -89,8 +89,7 @@ (:foreground "cyan"))) "Face for your code." :group 'smerge) -;; backward-compatibility alias -(put 'smerge-mine-face 'face-alias 'smerge-mine) +(define-obsolete-face-alias 'smerge-mine-face 'smerge-mine "22.1") (defvar smerge-mine-face 'smerge-mine) (defface smerge-other @@ -100,8 +99,7 @@ (:foreground "lightgreen"))) "Face for the other code." :group 'smerge) -;; backward-compatibility alias -(put 'smerge-other-face 'face-alias 'smerge-other) +(define-obsolete-face-alias 'smerge-other-face 'smerge-other "22.1") (defvar smerge-other-face 'smerge-other) (defface smerge-base @@ -113,8 +111,7 @@ (:foreground "orange"))) "Face for the base code." :group 'smerge) -;; backward-compatibility alias -(put 'smerge-base-face 'face-alias 'smerge-base) +(define-obsolete-face-alias 'smerge-base-face 'smerge-base "22.1") (defvar smerge-base-face 'smerge-base) (defface smerge-markers @@ -124,8 +121,7 @@ (:background "grey30"))) "Face for the conflict markers." :group 'smerge) -;; backward-compatibility alias -(put 'smerge-markers-face 'face-alias 'smerge-markers) +(define-obsolete-face-alias 'smerge-markers-face 'smerge-markers "22.1") (defvar smerge-markers-face 'smerge-markers) (defface smerge-refined-change