branch: elpa/alect-themes
commit ed598e60ba1a443f1085099b7abb35df31bf4285
Author: Alex Kost <[email protected]>
Commit: Alex Kost <[email protected]>
Add ocaml, tuareg, merlin and utop faces
---
README.md | 3 +++
alect-themes.el | 29 +++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/README.md b/README.md
index c42ed68..0b0cd8c 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,9 @@ supported (themed):
+ show-paren
- [aurel](https:/github.com/alezost/aurel)
- [auto-complete](https:/github.com/auto-complete/auto-complete)
+- Caml packages: [tuareg](https://github.com/ocaml/tuareg),
+ [merlin](https://github.com/the-lambda-church/merlin),
+ [utop](https://github.com/diml/utop)
- [company](http://company-mode.github.io/)
- [cperl](https://github.com/jrockway/cperl-mode)
- [dictem](https:/github.com/cheusov/dictem)
diff --git a/alect-themes.el b/alect-themes.el
index e2eaac6..ebccf27 100644
--- a/alect-themes.el
+++ b/alect-themes.el
@@ -1213,6 +1213,12 @@ For INVERT, see `alect-get-color'."
(markdown-pre-face ((,c :foreground ,(gc 'yellow+2))))
(markdown-reference-face ((,c :inherit link)))
+ ;; merlin
+ (merlin-locked-face ((,c :background ,(gc 'bg-2))))
+ (merlin-type-face ((,c :background ,(gc 'bg+1))))
+ (merlin-compilation-warning-face ((,c :inherit warning)))
+ (merlin-compilation-error-face ((,c :inherit error)))
+
;; message-mode
(message-cited-text ((,c :inherit font-lock-comment-face)))
(message-separator ((,c :inherit font-lock-comment-face)))
@@ -1349,6 +1355,10 @@ For INVERT, see `alect-get-color'."
(newsticker-treeview-old-face ((,c :foreground ,(gc 'bg+2))))
(newsticker-treeview-selection-face ((,c :foreground ,(gc 'yellow))))
+ ;; ocaml
+ (ocaml-help-face ((,c :inherit match)))
+ (ocaml-link-face ((,c :inherit link)))
+
;; org-mode
(org-agenda-date ((,c :inherit alect-time)))
(org-agenda-date-today ((,c :inherit alect-selected-item
@@ -1590,6 +1600,25 @@ For INVERT, see `alect-get-color'."
(term-color-cyan ((,c :foreground ,(gc 'cyan)
:background ,(gc 'cyan+1))))
+ ;; tuareg
+ (tuareg-font-lock-governing-face ((,c :foreground ,(gc 'fg+2)
+ :weight bold)))
+ (tuareg-font-lock-multistage-face ((,c :foreground ,(gc
'blue-2)
+ :background ,(gc
'bg))))
+ (tuareg-font-lock-line-number-face ((,c :foreground ,(gc
'fg-2))))
+ (tuareg-font-lock-operator-face ((,c :foreground ,(gc
'green-1))))
+ (tuareg-font-lock-module-face ((,c :foreground ,(gc
'cyan))))
+ (tuareg-font-lock-constructor-face ((,c :foreground ,(gc
'yellow))))
+ (tuareg-font-lock-error-face ((,c :inherit error
+ :underline t)))
+ (tuareg-font-lock-interactive-error-face ((,c :inherit
font-lock-warning-face)))
+ (tuareg-font-lock-interactive-output-face ((,c :foreground ,(gc
'fg))))
+
+ ;; utop
+ (utop-prompt ((,c :inherit alect-prompt)))
+ (utop-error ((,c :inherit error)))
+ (utop-stderr ((,c :foreground ,(gc 'red+1))))
+
;; vc
(vc-up-to-date-state ((,c :foreground ,(gc 'green-1))))
(vc-edited-state ((,c :foreground ,(gc 'yellow+1))))
