aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2005-05-12 20:04:32 +0000
committerStefan Monnier2005-05-12 20:04:32 +0000
commitbf2cea1da000b3e5ee09239ecf00cd885fac193d (patch)
treebbbe4f1eeed59ae9bd58d54b147cb44ffa4ed61f
parente94dae7fe3eb571843cfe6397b0ddcfa9b48a49a (diff)
downloademacs-bf2cea1da000b3e5ee09239ecf00cd885fac193d.tar.gz
emacs-bf2cea1da000b3e5ee09239ecf00cd885fac193d.zip
(font-lock-comment-delimiter-face): Inherit from
font-lock-comment-face rather than copying its setting.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/font-lock.el26
2 files changed, 10 insertions, 21 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f298bace3e..0c25bc236d6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-05-12 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * font-lock.el (font-lock-comment-delimiter-face): Inherit from
4 font-lock-comment-face rather than copying its setting.
5
12005-05-12 Andreas Schwab <schwab@suse.de> 62005-05-12 Andreas Schwab <schwab@suse.de>
2 7
3 * eshell/esh-mode.el (eshell-send-input): Doc fix. 8 * eshell/esh-mode.el (eshell-send-input): Doc fix.
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 1657400fe77..006d8713f9a 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1655,27 +1655,6 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
1655 1655
1656;; But now we do it the custom way. Note that `defface' will not overwrite any 1656;; But now we do it the custom way. Note that `defface' will not overwrite any
1657;; faces declared above via `custom-declare-face'. 1657;; faces declared above via `custom-declare-face'.
1658(defface font-lock-comment-delimiter-face
1659 '((((class grayscale) (background light))
1660 (:foreground "DimGray" :weight bold :slant italic))
1661 (((class grayscale) (background dark))
1662 (:foreground "LightGray" :weight bold :slant italic))
1663 (((class color) (min-colors 88) (background light))
1664 (:foreground "Firebrick"))
1665 (((class color) (min-colors 88) (background dark))
1666 (:foreground "chocolate1"))
1667 (((class color) (min-colors 16) (background light))
1668 (:foreground "red"))
1669 (((class color) (min-colors 16) (background dark))
1670 (:foreground "red1"))
1671 (((class color) (min-colors 8) (background light))
1672 (:foreground "red"))
1673 (((class color) (min-colors 8) (background dark))
1674 (:foreground "red1"))
1675 (t (:weight bold :slant italic)))
1676 "Font Lock mode face used to highlight comment delimiters."
1677 :group 'font-lock-highlighting-faces)
1678
1679(defface font-lock-comment-face 1658(defface font-lock-comment-face
1680 '((((class grayscale) (background light)) 1659 '((((class grayscale) (background light))
1681 (:foreground "DimGray" :weight bold :slant italic)) 1660 (:foreground "DimGray" :weight bold :slant italic))
@@ -1697,6 +1676,11 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
1697 "Font Lock mode face used to highlight comments." 1676 "Font Lock mode face used to highlight comments."
1698 :group 'font-lock-highlighting-faces) 1677 :group 'font-lock-highlighting-faces)
1699 1678
1679(defface font-lock-comment-delimiter-face
1680 '((t :inherit font-lock-comment-face))
1681 "Font Lock mode face used to highlight comment delimiters."
1682 :group 'font-lock-highlighting-faces)
1683
1700(defface font-lock-string-face 1684(defface font-lock-string-face
1701 '((((class grayscale) (background light)) (:foreground "DimGray" :slant italic)) 1685 '((((class grayscale) (background light)) (:foreground "DimGray" :slant italic))
1702 (((class grayscale) (background dark)) (:foreground "LightGray" :slant italic)) 1686 (((class grayscale) (background dark)) (:foreground "LightGray" :slant italic))