Merge pull request #10 from jlr/master

Upgrade rainbow-delimiters to current version.
overtone · Jan 10, 2012 · a25aa00 · a25aa00
2 parents 22bffd4 + 5977a70
commit a25aa00
Show file tree

Hide file tree

Showing 9 changed files with 499 additions and 335 deletions.
diff --git a/lib/blackbored.el b/lib/blackbored.el
@@ -117,6 +117,17 @@
      (grep-hit-face ((t (:foreground "black" :background "red"))))
      (grep-context-face ((t (:foreground "black" :background "deep pink"))))
 
+     (rainbow-delimiters-depth-1-face ((t (:foreground "dark red"))))
+     (rainbow-delimiters-depth-2-face ((t (:foreground "dark green"))))
+     (rainbow-delimiters-depth-3-face ((t (:foreground "deep pink"))))
+     (rainbow-delimiters-depth-4-face ((t (:foreground "yellow"))))
+     (rainbow-delimiters-depth-5-face ((t (:foreground "green"))))
+     (rainbow-delimiters-depth-6-face ((t (:foreground "light blue"))))
+     (rainbow-delimiters-depth-7-face ((t (:foreground "orange"))))
+     (rainbow-delimiters-depth-8-face ((t (:foreground "slate blue"))))
+     (rainbow-delimiters-depth-9-face ((t (:foreground "light gray"))))
+     (rainbow-delimiters-unmatched-face ((t (:foreground "white"))))
+
      (erc-notice-face ((t (:bold t :foreground "grey26"))))
 
      (erc-action-face ((t (:foreground "#FF6400"))))

diff --git a/lib/durendal/durendal.el b/lib/durendal/durendal.el
@@ -231,7 +231,6 @@
 
                     (add-hook 'slime-repl-mode-hook 'durendal-slime-repl-paredit)
                     (add-hook 'slime-repl-mode-hook 'rainbow-delimiters-mode)
-                    (add-hook 'slime-repl-mode-hook 'rainbow-paren-mode)
                     (add-hook 'sldb-mode-hook 'durendal-dim-sldb-font-lock)
                     (durendal-enable-slime-repl-font-lock))