diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/vc/diff-mode.el | 3 | ||||
| -rw-r--r-- | lisp/vc/smerge-mode.el | 3 |
3 files changed, 14 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 52590987487..1f0bf124c7f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2014-06-18 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-06-17 Stefan Monnier <monnier@iro.umontreal.ca> * rect.el (rectangle-preview): New custom. diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 923de9a0ca6..3d985d9ca4d 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -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 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 |