diff options
| author | Juri Linkov <juri@jurta.org> | 2014-06-18 11:33:57 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2014-06-18 11:33:57 +0300 |
| commit | 7c6fc37fa9a78a7a02f3f0ccb46a95c20fe315b4 (patch) | |
| tree | 1e8ebc037aec238d0f3e7bcb8306be4036bff351 /lisp/vc/smerge-mode.el | |
| parent | 5139e960b9acbfd4b1898539ad1106b578bc72a8 (diff) | |
| download | emacs-7c6fc37fa9a78a7a02f3f0ccb46a95c20fe315b4.tar.gz emacs-7c6fc37fa9a78a7a02f3f0ccb46a95c20fe315b4.tar.bz2 emacs-7c6fc37fa9a78a7a02f3f0ccb46a95c20fe315b4.zip | |
* lisp/vc/diff-mode.el (diff-refine-changed): Rename from
`diff-refine-change' for consistency with `diff-changed'.
(diff-refine-change): Add obsolete face alias.
* lisp/vc/smerge-mode.el (smerge-refined-changed): Rename from
`smerge-refined-change'.
(smerge-refined-change): Add obsolete face alias.
Fixes: debbugs:10181
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index cc9c4673345..771281555ab 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -116,9 +116,10 @@ Used in `smerge-diff-base-mine' and related functions." (define-obsolete-face-alias 'smerge-markers-face 'smerge-markers "22.1") (defvar smerge-markers-face 'smerge-markers) -(defface smerge-refined-change +(defface smerge-refined-changed '((t nil)) "Face used for char-based changes shown by `smerge-refine'.") +(define-obsolete-face-alias 'smerge-refined-change 'smerge-refined-changed "24.5") (defface smerge-refined-removed '((default |