[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105486: * lisp/faces.el (error, warn
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105486: * lisp/faces.el (error, warning, success): New faces with definitions |
Date: |
Thu, 18 Aug 2011 14:36:19 +0300 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105486
fixes bug(s): http://debbugs.gnu.org/6117
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Thu 2011-08-18 14:36:19 +0300
message:
* 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'.
modified:
etc/NEWS
lisp/ChangeLog
lisp/dired.el
lisp/faces.el
lisp/font-lock.el
lisp/progmodes/compile.el
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2011-08-18 10:53:55 +0000
+++ b/etc/NEWS 2011-08-18 11:36:19 +0000
@@ -234,6 +234,9 @@
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.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-08-17 22:02:49 +0000
+++ b/lisp/ChangeLog 2011-08-18 11:36:19 +0000
@@ -1,3 +1,18 @@
+2011-08-18 Juri Linkov <address@hidden>
+
+ * 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 <address@hidden>
* mail/smtpmail.el (auth-source): Require to avoid problems with
=== modified file 'lisp/dired.el'
--- a/lisp/dired.el 2011-08-04 00:58:07 +0000
+++ b/lisp/dired.el 2011-08-18 11:36:19 +0000
@@ -342,7 +342,7 @@
"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 @@
"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")
=== modified file 'lisp/faces.el'
--- a/lisp/faces.el 2011-08-07 14:14:54 +0000
+++ b/lisp/faces.el 2011-08-18 11:36:19 +0000
@@ -2413,6 +2413,39 @@
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.
=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2011-07-14 13:50:25 +0000
+++ b/lisp/font-lock.el 2011-08-18 11:36:19 +0000
@@ -1959,12 +1959,7 @@
: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)
=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2011-07-12 14:40:56 +0000
+++ b/lisp/progmodes/compile.el 2011-08-18 11:36:19 +0000
@@ -647,19 +647,19 @@
(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")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105486: * lisp/faces.el (error, warning, success): New faces with definitions,
Juri Linkov <=