aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2011-08-18 14:36:19 +0300
committerJuri Linkov2011-08-18 14:36:19 +0300
commitbc987f8b80cbab4d8319d05a9499c615213a0685 (patch)
tree3ec5356d94c610a669aa2e2a0081af2729bfa782
parentc094bb0cf7eee9defdd76b8432dcbc24a7c6856d (diff)
downloademacs-bc987f8b80cbab4d8319d05a9499c615213a0685.tar.gz
emacs-bc987f8b80cbab4d8319d05a9499c615213a0685.zip
* lisp/faces.el (error, warning, success): New faces with definitions
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
-rw-r--r--etc/NEWS3
-rw-r--r--lisp/ChangeLog15
-rw-r--r--lisp/dired.el4
-rw-r--r--lisp/faces.el33
-rw-r--r--lisp/font-lock.el7
-rw-r--r--lisp/progmodes/compile.el6
6 files changed, 57 insertions, 11 deletions
diff --git a/etc/NEWS b/etc/NEWS
index ed472a5668a..7b46259f7d9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -234,6 +234,9 @@ these image types, minus those listed in `imagemagick-types-inhibit'.
234 234
235See the Emacs Lisp Reference Manual for more information. 235See the Emacs Lisp Reference Manual for more information.
236 236
237** New basic faces `error', `warning', `success' are available to
238highlight strings that indicate failure, caution or successful operation.
239
237** The colors for selected text (the region face) are taken from the GTK 240** The colors for selected text (the region face) are taken from the GTK
238theme when Emacs is built with GTK. 241theme when Emacs is built with GTK.
239 242
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f57bd437af6..4f0e832bc67 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
12011-08-18 Juri Linkov <juri@jurta.org>
2
3 * faces.el (error, warning, success): New faces with definitions
4 copied from old default values of `font-lock-warning-face',
5 `compilation-warning', `compilation-info' (bug#6117).
6
7 * font-lock.el (font-lock-warning-face): Inherit from `error'.
8
9 * progmodes/compile.el (compilation-error): Inherit from `error'.
10 (compilation-warning): Inherit from `warning'.
11 (compilation-info): Inherit from `success'.
12
13 * dired.el (dired-marked): Inherit from `warning'.
14 (dired-flagged): Inherit from `error'.
15
12011-08-17 Lars Magne Ingebrigtsen <larsi@gnus.org> 162011-08-17 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 17
3 * mail/smtpmail.el (auth-source): Require to avoid problems with 18 * mail/smtpmail.el (auth-source): Require to avoid problems with
diff --git a/lisp/dired.el b/lisp/dired.el
index 746c16ff148..ecb626a275e 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -342,7 +342,7 @@ Subexpression 2 must end right before the \\n or \\r.")
342 "Face name used for dired marks.") 342 "Face name used for dired marks.")
343 343
344(defface dired-marked 344(defface dired-marked
345 '((t (:inherit font-lock-warning-face))) 345 '((t (:inherit warning)))
346 "Face used for marked files." 346 "Face used for marked files."
347 :group 'dired-faces 347 :group 'dired-faces
348 :version "22.1") 348 :version "22.1")
@@ -350,7 +350,7 @@ Subexpression 2 must end right before the \\n or \\r.")
350 "Face name used for marked files.") 350 "Face name used for marked files.")
351 351
352(defface dired-flagged 352(defface dired-flagged
353 '((t (:inherit font-lock-variable-name-face))) 353 '((t (:inherit error)))
354 "Face used for files flagged for deletion." 354 "Face used for files flagged for deletion."
355 :group 'dired-faces 355 :group 'dired-faces
356 :version "22.1") 356 :version "22.1")
diff --git a/lisp/faces.el b/lisp/faces.el
index 9a78ab69caa..404bd7b6609 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2413,6 +2413,39 @@ Note: Other faces cannot inherit from the cursor face."
2413It is used for characters of no fonts too." 2413It is used for characters of no fonts too."
2414 :version "24.1" 2414 :version "24.1"
2415 :group 'basic-faces) 2415 :group 'basic-faces)
2416
2417(defface error
2418 '((((class color) (min-colors 88) (background light)) (:foreground "Red1" :weight bold))
2419 (((class color) (min-colors 88) (background dark)) (:foreground "Pink" :weight bold))
2420 (((class color) (min-colors 16) (background light)) (:foreground "Red1" :weight bold))
2421 (((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold))
2422 (((class color) (min-colors 8)) (:foreground "red"))
2423 (t (:inverse-video t :weight bold)))
2424 "Basic face used to highlight errors and to denote failure."
2425 :version "24.1"
2426 :group 'basic-faces)
2427
2428(defface warning
2429 '((((class color) (min-colors 16)) (:foreground "DarkOrange" :weight bold))
2430 (((class color)) (:foreground "yellow" :weight bold))
2431 (t (:weight bold)))
2432 "Basic face used to highlight warnings."
2433 :version "24.1"
2434 :group 'basic-faces)
2435
2436(defface success
2437 '((((class color) (min-colors 16) (background light))
2438 (:foreground "Green3" :weight bold))
2439 (((class color) (min-colors 88) (background dark))
2440 (:foreground "Green1" :weight bold))
2441 (((class color) (min-colors 16) (background dark))
2442 (:foreground "Green" :weight bold))
2443 (((class color)) (:foreground "green" :weight bold))
2444 (t (:weight bold)))
2445 "Basic face used to indicate successful operation."
2446 :version "24.1"
2447 :group 'basic-faces)
2448
2416 2449
2417;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 2450;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2418;;; Manipulating font names. 2451;;; Manipulating font names.
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 6902ce98ab1..9cf889e1aec 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1959,12 +1959,7 @@ Sets various variables using `font-lock-defaults' and
1959 :group 'font-lock-faces) 1959 :group 'font-lock-faces)
1960 1960
1961(defface font-lock-warning-face 1961(defface font-lock-warning-face
1962 '((((class color) (min-colors 88) (background light)) (:foreground "Red1" :weight bold)) 1962 '((t :inherit error))
1963 (((class color) (min-colors 88) (background dark)) (:foreground "Pink" :weight bold))
1964 (((class color) (min-colors 16) (background light)) (:foreground "Red1" :weight bold))
1965 (((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold))
1966 (((class color) (min-colors 8)) (:foreground "red"))
1967 (t (:inverse-video t :weight bold)))
1968 "Font Lock mode face used to highlight warnings." 1963 "Font Lock mode face used to highlight warnings."
1969 :group 'font-lock-faces) 1964 :group 'font-lock-faces)
1970 1965
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 503698f0f7b..f3b873c8b1e 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -647,19 +647,19 @@ starting the compilation process.")
647(defvar compile-history nil) 647(defvar compile-history nil)
648 648
649(defface compilation-error 649(defface compilation-error
650 '((t :inherit font-lock-warning-face)) 650 '((t :inherit error))
651 "Face used to highlight compiler errors." 651 "Face used to highlight compiler errors."
652 :group 'compilation 652 :group 'compilation
653 :version "22.1") 653 :version "22.1")
654 654
655(defface compilation-warning 655(defface compilation-warning
656 '((t :inherit font-lock-variable-name-face)) 656 '((t :inherit warning))
657 "Face used to highlight compiler warnings." 657 "Face used to highlight compiler warnings."
658 :group 'compilation 658 :group 'compilation
659 :version "22.1") 659 :version "22.1")
660 660
661(defface compilation-info 661(defface compilation-info
662 '((t :inherit font-lock-type-face)) 662 '((t :inherit success))
663 "Face used to highlight compiler information." 663 "Face used to highlight compiler information."
664 :group 'compilation 664 :group 'compilation
665 :version "22.1") 665 :version "22.1")