Commit 4ede14b9 authored by Juri Linkov's avatar Juri Linkov Committed by Stefan Monnier

* 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.
[Backport]

Fixes: debbugs:10181
parent a8cab054
2014-10-20 Juri Linkov <juri@jurta.org>
* vc/diff-mode.el (diff-refine-changed): Rename from
`diff-refine-change' for consistency with `diff-changed'.
(diff-refine-change): Add obsolete face alias. (Bug#10181)
* vc/smerge-mode.el (smerge-refined-changed): Rename from
`smerge-refined-change'.
(smerge-refined-change): Add obsolete face alias.
2014-09-05 Stefan Monnier <monnier@iro.umontreal.ca>
* subr.el (call-process-shell-command, process-file-shell-command):
......
......@@ -1916,7 +1916,7 @@ For use in `add-log-current-defun-function'."
;;; Fine change highlighting.
(defface diff-refine-change
(defface diff-refine-changed
'((((class color) (min-colors 88) (background light))
:background "#ffff55")
(((class color) (min-colors 88) (background dark))
......@@ -1924,6 +1924,7 @@ For use in `add-log-current-defun-function'."
(t :inverse-video t))
"Face used for char-based changes shown by `diff-refine-hunk'."
:group 'diff-mode)
(define-obsolete-face-alias 'diff-refine-change 'diff-refine-changed "24.5")
(defface diff-refine-removed
'((default
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment