diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-04-16 05:41:53 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-04-16 05:41:53 +0000 |
| commit | d183ee5fecd44f626498282018547a067dfbaceb (patch) | |
| tree | ba6fe370bae8e12c050eabe700d4fc105c921a21 /lisp/font-lock.el | |
| parent | 6c1eb4b260acab1425e200b4ccada4bda138a9e5 (diff) | |
| download | emacs-d183ee5fecd44f626498282018547a067dfbaceb.tar.gz | |
(font-lock-make-faces): Determine font-lock-background-mode from color
values of background color.
(font-lock-make-faces-done): New variable.
(font-lock-make-faces): Set font-lock-make-faces-done to t.
Don't call it when loading the file.
(font-lock-mode): Call font-lock-make-faces if not yet done.
Diffstat (limited to 'lisp/font-lock.el')
| -rw-r--r-- | lisp/font-lock.el | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lisp/font-lock.el b/lisp/font-lock.el index d96051b429f..f16be50a4c3 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -209,6 +209,9 @@ Resources can be used to over-ride these face attributes. For example, the resource `Emacs.font-lock-comment-face.attributeUnderline' can be used to specify the UNDERLINE-P attribute for face `font-lock-comment-face'.") +(defvar font-lock-make-faces-done nil + "Non-nil if have already set up the faces for Font-Lock mode.") + (defun font-lock-make-faces () "Make faces from `font-lock-face-attributes'. A default list is used if this is nil. @@ -229,10 +232,9 @@ See `font-lock-make-face' and `list-faces-display'." "BackgroundMode")) (params (frame-parameters))) (cond (bg-resource (intern (downcase bg-resource))) - ((or (string-equal "white" - (downcase (cdr (assq 'foreground-color params)))) - (string-equal "black" - (downcase (cdr (assq 'background-color params))))) + ((< (apply '+ (x-color-values + (cdr (assq 'background-color params)))) + (/ (apply '+ (x-color-values "white")) 3)) 'dark) (t 'light))))) (if (null font-lock-face-attributes) @@ -291,7 +293,8 @@ See `font-lock-make-face' and `list-faces-display'." (font-lock-variable-name-face "LightGoldenrod") (font-lock-type-face "PaleGreen") (font-lock-reference-face "Aquamarine"))))))) - (mapcar 'font-lock-make-face font-lock-face-attributes)) + (mapcar 'font-lock-make-face font-lock-face-attributes) + (setq font-lock-make-faces-done t)) (defun font-lock-make-face (face-attributes) "Make a face from FACE-ATTRIBUTES. @@ -583,6 +586,10 @@ fontification occurs only if the buffer is less than `font-lock-maximum-size'. To fontify a buffer without turning on Font Lock mode, and regardless of buffer size, you can use \\[font-lock-fontify-buffer]." (interactive "P") + + (or font-lock-make-faces-done + (font-lock-make-faces)) + (let ((on-p (if arg (> (prefix-numeric-value arg) 0) (not font-lock-mode)))) (if (equal (buffer-name) " *Compiler Input*") ; hack for bytecomp... (setq on-p nil)) @@ -928,10 +935,6 @@ and `font-lock-keywords-case-fold-search' using `font-lock-defaults-alist'." ;; Install ourselves: -(if purify-flag - (add-hook 'after-init-hook 'font-lock-make-faces) - (font-lock-make-faces)) - (or (assq 'font-lock-mode minor-mode-alist) (setq minor-mode-alist (cons '(font-lock-mode " Font") minor-mode-alist))) |