procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/faces.el (error, warning, success): New faces with definitions

Browse source 
copied from old default values of `font-lock-warning-face',
`compilation-warning', `compilation-info'.

* lisp/font-lock.el (font-lock-warning-face): Inherit from `error'.

* lisp/progmodes/compile.el (compilation-error): Inherit from `error'.
(compilation-warning): Inherit from `warning'.
(compilation-info): Inherit from `success'.

* lisp/dired.el (dired-marked): Inherit from `warning'.
(dired-flagged): Inherit from `error'.

Fixes: debbugs:6117
This commit is contained in:
Juri Linkov 2011-08-18 14:36:19 +03:00
parent c094bb0cf7
commit bc987f8b80
6 changed files with 57 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
etc/NEWS
View file

@ -234,6 +234,9 @@ these image types, minus those listed in `imagemagick-types-inhibit'.
See the Emacs Lisp Reference Manual for more information.
** New basic faces `error', `warning', `success' are available to
highlight strings that indicate failure, caution or successful operation.
** The colors for selected text (the region face) are taken from the GTK
theme when Emacs is built with GTK.

15
lisp/ChangeLog
View file

@ -1,3 +1,18 @@
2011-08-18 Juri Linkov <juri@jurta.org>
* faces.el (error, warning, success): New faces with definitions
copied from old default values of `font-lock-warning-face',
`compilation-warning', `compilation-info' (bug#6117).
* font-lock.el (font-lock-warning-face): Inherit from `error'.
* progmodes/compile.el (compilation-error): Inherit from `error'.
(compilation-warning): Inherit from `warning'.
(compilation-info): Inherit from `success'.
* dired.el (dired-marked): Inherit from `warning'.
(dired-flagged): Inherit from `error'.
2011-08-17 Lars Magne Ingebrigtsen <larsi@gnus.org>
* mail/smtpmail.el (auth-source): Require to avoid problems with

4
lisp/dired.el
View file

@ -342,7 +342,7 @@ Subexpression 2 must end right before the \\n or \\r.")
"Face name used for dired marks.")
(defface dired-marked
'((t (:inherit font-lock-warning-face)))
'((t (:inherit warning)))
"Face used for marked files."
:group 'dired-faces
:version "22.1")
@ -350,7 +350,7 @@ Subexpression 2 must end right before the \\n or \\r.")
"Face name used for marked files.")
(defface dired-flagged
'((t (:inherit font-lock-variable-name-face)))
'((t (:inherit error)))
"Face used for files flagged for deletion."
:group 'dired-faces
:version "22.1")

33
lisp/faces.el
View file

@ -2413,6 +2413,39 @@ Note: Other faces cannot inherit from the cursor face."
It is used for characters of no fonts too."
:version "24.1"
:group 'basic-faces)
(defface error
'((((class color) (min-colors 88) (background light)) (:foreground "Red1" :weight bold))
(((class color) (min-colors 88) (background dark)) (:foreground "Pink" :weight bold))
(((class color) (min-colors 16) (background light)) (:foreground "Red1" :weight bold))
(((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold))
(((class color) (min-colors 8)) (:foreground "red"))
(t (:inverse-video t :weight bold)))
"Basic face used to highlight errors and to denote failure."
:version "24.1"
:group 'basic-faces)
(defface warning
'((((class color) (min-colors 16)) (:foreground "DarkOrange" :weight bold))
(((class color)) (:foreground "yellow" :weight bold))
(t (:weight bold)))
"Basic face used to highlight warnings."
:version "24.1"
:group 'basic-faces)
(defface success
'((((class color) (min-colors 16) (background light))
(:foreground "Green3" :weight bold))
(((class color) (min-colors 88) (background dark))
(:foreground "Green1" :weight bold))
(((class color) (min-colors 16) (background dark))
(:foreground "Green" :weight bold))
(((class color)) (:foreground "green" :weight bold))
(t (:weight bold)))
"Basic face used to indicate successful operation."
:version "24.1"
:group 'basic-faces)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Manipulating font names.

7
lisp/font-lock.el
View file

@ -1959,12 +1959,7 @@ Sets various variables using `font-lock-defaults' and
:group 'font-lock-faces)
(defface font-lock-warning-face
'((((class color) (min-colors 88) (background light)) (:foreground "Red1" :weight bold))
(((class color) (min-colors 88) (background dark)) (:foreground "Pink" :weight bold))
(((class color) (min-colors 16) (background light)) (:foreground "Red1" :weight bold))
(((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold))
(((class color) (min-colors 8)) (:foreground "red"))
(t (:inverse-video t :weight bold)))
'((t :inherit error))
"Font Lock mode face used to highlight warnings."
:group 'font-lock-faces)

6
lisp/progmodes/compile.el
View file

@ -647,19 +647,19 @@ starting the compilation process.")
(defvar compile-history nil)
(defface compilation-error
'((t :inherit font-lock-warning-face))
'((t :inherit error))
"Face used to highlight compiler errors."
:group 'compilation
:version "22.1")
(defface compilation-warning
'((t :inherit font-lock-variable-name-face))
'((t :inherit warning))
"Face used to highlight compiler warnings."
:group 'compilation
:version "22.1")
(defface compilation-info
'((t :inherit font-lock-type-face))
'((t :inherit success))
"Face used to highlight compiler information."
:group 'compilation
:version "22.1")