diff options
| author | Stefan Monnier | 2005-05-13 03:34:50 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2005-05-13 03:34:50 +0000 |
| commit | 3989c3e714ac2b9b8e7ab62f8cd1b16ffaf69e10 (patch) | |
| tree | 14c49766bbbea93ef7261225779cc4c0e39f6f4a | |
| parent | 3f2bf04a77828d521245c29324340decc2f8c2f3 (diff) | |
| download | emacs-3989c3e714ac2b9b8e7ab62f8cd1b16ffaf69e10.tar.gz emacs-3989c3e714ac2b9b8e7ab62f8cd1b16ffaf69e10.zip | |
(font-lock-comment-delimiter-face): Fix up the inheritance.
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/font-lock.el | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 39ed1402c07..af10efb5c2d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2005-05-12 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * font-lock.el (font-lock-comment-delimiter-face): Fix up | ||
| 4 | the inheritance. | ||
| 5 | |||
| 1 | 2005-05-12 Luc Teirlinck <teirllm@auburn.edu> | 6 | 2005-05-12 Luc Teirlinck <teirllm@auburn.edu> |
| 2 | 7 | ||
| 3 | * progmodes/inf-lisp.el (inferior-lisp-mode-hook) | 8 | * progmodes/inf-lisp.el (inferior-lisp-mode-hook) |
| @@ -60,6 +65,12 @@ | |||
| 60 | 65 | ||
| 61 | 2005-05-11 Stefan Monnier <monnier@iro.umontreal.ca> | 66 | 2005-05-11 Stefan Monnier <monnier@iro.umontreal.ca> |
| 62 | 67 | ||
| 68 | * font-lock.el (font-lock-fontify-syntactically-region): Don't use | ||
| 69 | comment-end if comment-start-skip is not set. | ||
| 70 | Obey the font-lock-comment-delimiter-face variables. | ||
| 71 | |||
| 72 | 2005-05-11 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 73 | |||
| 63 | * files.el (executable-find): Move from executable.el. Use locate-file. | 74 | * files.el (executable-find): Move from executable.el. Use locate-file. |
| 64 | * progmodes/executable.el (executable-find): Move to files.el. | 75 | * progmodes/executable.el (executable-find): Move to files.el. |
| 65 | 76 | ||
diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 762923809d5..eb3ad97d7ce 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el | |||
| @@ -1678,6 +1678,8 @@ Sets various variables using `font-lock-defaults' (or, if nil, using | |||
| 1678 | 1678 | ||
| 1679 | (defface font-lock-comment-delimiter-face | 1679 | (defface font-lock-comment-delimiter-face |
| 1680 | '((default :inherit font-lock-comment-face) | 1680 | '((default :inherit font-lock-comment-face) |
| 1681 | (((class grayscale))) | ||
| 1682 | (((class color) (min-colors 16))) | ||
| 1681 | (((class color) (min-colors 8) (background light)) | 1683 | (((class color) (min-colors 8) (background light)) |
| 1682 | :foreground "red") | 1684 | :foreground "red") |
| 1683 | (((class color) (min-colors 8) (background dark)) | 1685 | (((class color) (min-colors 8) (background dark)) |