[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117611: * lisp/vc/diff-mode.el (diff-refine-chan
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs-24 r117611: * lisp/vc/diff-mode.el (diff-refine-changed): Rename from |
Date: |
Tue, 21 Oct 2014 00:12:03 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117611
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10181
author: Juri Linkov <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-10-20 20:11:58 -0400
message:
* 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]
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/vc/diff-mode.el
diffmode.el-20091113204419-o5vbwnq5f7feedwu-1659
lisp/vc/smerge-mode.el
smergemode.el-20091113204419-o5vbwnq5f7feedwu-1726
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-10-20 22:44:11 +0000
+++ b/lisp/ChangeLog 2014-10-21 00:11:58 +0000
@@ -1,3 +1,13 @@
+2014-10-20 Juri Linkov <address@hidden>
+
+ * 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 <address@hidden>
* subr.el (call-process-shell-command, process-file-shell-command):
=== modified file 'lisp/vc/diff-mode.el'
--- a/lisp/vc/diff-mode.el 2014-01-01 07:43:34 +0000
+++ b/lisp/vc/diff-mode.el 2014-10-21 00:11:58 +0000
@@ -1916,7 +1916,7 @@
;;; 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 @@
(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
=== modified file 'lisp/vc/smerge-mode.el'
--- a/lisp/vc/smerge-mode.el 2014-01-01 07:43:34 +0000
+++ b/lisp/vc/smerge-mode.el 2014-10-21 00:11:58 +0000
@@ -116,9 +116,10 @@
(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117611: * lisp/vc/diff-mode.el (diff-refine-changed): Rename from,
Stefan Monnier <=