[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 9f1786e: Faces names should not end in "-face".
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-25 9f1786e: Faces names should not end in "-face". |
Date: |
Sat, 09 Apr 2016 00:59:26 +0000 |
branch: emacs-25
commit 9f1786e4165aba30ddb16116c5557a0531233008
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Faces names should not end in "-face".
* lisp/rect.el (rectangle-preview): Rename from rectangle-preview-face.
* lisp/vc/vc-hooks.el (vc-state-base): Rename from vc-state-base-face.
---
lisp/rect.el | 5 +++--
lisp/vc/vc-hooks.el | 18 +++++++++---------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/lisp/rect.el b/lisp/rect.el
index 73790f2..685213a 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -398,8 +398,9 @@ With a prefix (or a FILL) argument, also fill too short
lines."
(defun rectangle--space-to (col)
(propertize " " 'display `(space :align-to ,col)))
-(defface rectangle-preview-face '((t :inherit region))
- "The face to use for the `string-rectangle' preview.")
+(defface rectangle-preview '((t :inherit region))
+ "The face to use for the `string-rectangle' preview."
+ :version "25.1")
(defcustom rectangle-preview t
"If non-nil, `string-rectangle' will show an-the-fly preview."
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 22c4d17..0826744 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -40,7 +40,7 @@
:group 'mode-line
:version "25.1")
-(defface vc-state-base-face
+(defface vc-state-base
'((default))
"Base face for VC state indicator."
:group 'vc-faces
@@ -48,49 +48,49 @@
:version "25.1")
(defface vc-up-to-date-state
- '((default :inherit vc-state-base-face))
+ '((default :inherit vc-state-base))
"Face for VC modeline state when the file is up to date."
:version "25.1"
:group 'vc-faces)
(defface vc-needs-update-state
- '((default :inherit vc-state-base-face))
+ '((default :inherit vc-state-base))
"Face for VC modeline state when the file needs update."
:version "25.1"
:group 'vc-faces)
(defface vc-locked-state
- '((default :inherit vc-state-base-face))
+ '((default :inherit vc-state-base))
"Face for VC modeline state when the file locked."
:version "25.1"
:group 'vc-faces)
(defface vc-locally-added-state
- '((default :inherit vc-state-base-face))
+ '((default :inherit vc-state-base))
"Face for VC modeline state when the file is locally added."
:version "25.1"
:group 'vc-faces)
(defface vc-conflict-state
- '((default :inherit vc-state-base-face))
+ '((default :inherit vc-state-base))
"Face for VC modeline state when the file contains merge conflicts."
:version "25.1"
:group 'vc-faces)
(defface vc-removed-state
- '((default :inherit vc-state-base-face))
+ '((default :inherit vc-state-base))
"Face for VC modeline state when the file was removed from the VC system."
:version "25.1"
:group 'vc-faces)
(defface vc-missing-state
- '((default :inherit vc-state-base-face))
+ '((default :inherit vc-state-base))
"Face for VC modeline state when the file is missing from the file system."
:version "25.1"
:group 'vc-faces)
(defface vc-edited-state
- '((default :inherit vc-state-base-face))
+ '((default :inherit vc-state-base))
"Face for VC modeline state when the file is edited."
:version "25.1"
:group 'vc-faces)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 9f1786e: Faces names should not end in "-face".,
Glenn Morris <=