mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/vc/diff-mode.el (diff-refine-changed): Rename from

Browse source 
`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
This commit is contained in:
Juri Linkov 2014-06-18 11:33:57 +03:00
parent 5139e960b9
commit 7c6fc37fa9
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/ChangeLog
View file

@ -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.

3
lisp/vc/diff-mode.el
View file

@ -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

3
lisp/vc/smerge-mode.el
View file

@ -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