mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-29 19:48:19 +00:00
Code Issues Releases Activity

Faces names should not end in "-face".

Browse Source 
* lisp/rect.el (rectangle-preview): Rename from rectangle-preview-face.
* lisp/vc/vc-hooks.el (vc-state-base): Rename from vc-state-base-face.
This commit is contained in:
Glenn Morris 2016-04-08 20:59:21 -04:00
parent 3283271253
commit 9f1786e416
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/rect.el
View File

@ -398,8 +398,9 @@ With a prefix (or a FILL) argument, also fill too short lines."
(defun rectangle--space-to (col) (defun rectangle--space-to (col)
(propertize " " 'display `(space :align-to ,col))) (propertize " " 'display `(space :align-to ,col)))
(defface rectangle-preview-face '((t :inherit region)) (defface rectangle-preview '((t :inherit region))
"The face to use for the `string-rectangle' preview.") "The face to use for the `string-rectangle' preview."
:version "25.1")
(defcustom rectangle-preview t (defcustom rectangle-preview t
"If non-nil, `string-rectangle' will show an-the-fly preview." "If non-nil, `string-rectangle' will show an-the-fly preview."

18
lisp/vc/vc-hooks.el
View File

@ -40,7 +40,7 @@
:group 'mode-line :group 'mode-line
:version "25.1") :version "25.1")
(defface vc-state-base-face (defface vc-state-base
'((default)) '((default))
"Base face for VC state indicator." "Base face for VC state indicator."
:group 'vc-faces :group 'vc-faces
@ -48,49 +48,49 @@
:version "25.1") :version "25.1")
(defface vc-up-to-date-state (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." "Face for VC modeline state when the file is up to date."
:version "25.1" :version "25.1"
:group 'vc-faces) :group 'vc-faces)
(defface vc-needs-update-state (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." "Face for VC modeline state when the file needs update."
:version "25.1" :version "25.1"
:group 'vc-faces) :group 'vc-faces)
(defface vc-locked-state (defface vc-locked-state
'((default :inherit vc-state-base-face)) '((default :inherit vc-state-base))
"Face for VC modeline state when the file locked." "Face for VC modeline state when the file locked."
:version "25.1" :version "25.1"
:group 'vc-faces) :group 'vc-faces)
(defface vc-locally-added-state (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." "Face for VC modeline state when the file is locally added."
:version "25.1" :version "25.1"
:group 'vc-faces) :group 'vc-faces)
(defface vc-conflict-state (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." "Face for VC modeline state when the file contains merge conflicts."
:version "25.1" :version "25.1"
:group 'vc-faces) :group 'vc-faces)
(defface vc-removed-state (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." "Face for VC modeline state when the file was removed from the VC system."
:version "25.1" :version "25.1"
:group 'vc-faces) :group 'vc-faces)
(defface vc-missing-state (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." "Face for VC modeline state when the file is missing from the file system."
:version "25.1" :version "25.1"
:group 'vc-faces) :group 'vc-faces)
(defface vc-edited-state (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." "Face for VC modeline state when the file is edited."
:version "25.1" :version "25.1"
:group 'vc-faces) :group 'vc-faces)