[nongnu] externals/caml 39cfb2e 049/197: define only if needed

[Stefan Monnier]

branch: externals/caml
commit 39cfb2e7922532a625024dd36454127500eb1274
Author: Jacques Garrigue <garrigue at math.nagoya-u.ac.jp>
Commit: Jacques Garrigue <garrigue at math.nagoya-u.ac.jp>

    define only if needed
    
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4536 
f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 caml-font.el | 51 ++++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/caml-font.el b/caml-font.el
index 61968eb..aca7894 100644
--- a/caml-font.el
+++ b/caml-font.el
@@ -2,36 +2,37 @@
 
 (cond
  ((x-display-color-p)
-;
-;       (not (memq 'font-lock-type-face (face-list))))
-  ; make the necessary faces
-  (make-face 'Firebrick)
-  (set-face-foreground 'Firebrick "Firebrick")
-  (make-face 'RosyBrown)
-  (set-face-foreground 'RosyBrown "RosyBrown")
-  (make-face 'Purple)
-  (set-face-foreground 'Purple "Purple")
-  (make-face 'MidnightBlue)
-  (set-face-foreground 'MidnightBlue "MidnightBlue")
-  (make-face 'DarkGoldenRod)
-  (set-face-foreground 'DarkGoldenRod "DarkGoldenRod")
-  (make-face 'DarkOliveGreen)
-  (set-face-foreground 'DarkOliveGreen "DarkOliveGreen4")
-  (make-face 'CadetBlue)
-  (set-face-foreground 'CadetBlue "CadetBlue")
+  (cond
+   ((not (memq 'font-lock-type-face (face-list)))
+    ; make the necessary faces
+    (make-face 'Firebrick)
+    (set-face-foreground 'Firebrick "Firebrick")
+    (make-face 'RosyBrown)
+    (set-face-foreground 'RosyBrown "RosyBrown")
+    (make-face 'Purple)
+    (set-face-foreground 'Purple "Purple")
+    (make-face 'MidnightBlue)
+    (set-face-foreground 'MidnightBlue "MidnightBlue")
+    (make-face 'DarkGoldenRod)
+    (set-face-foreground 'DarkGoldenRod "DarkGoldenRod")
+    (make-face 'DarkOliveGreen)
+    (set-face-foreground 'DarkOliveGreen "DarkOliveGreen4")
+    (make-face 'CadetBlue)
+    (set-face-foreground 'CadetBlue "CadetBlue")
+    ; assign them as standard faces
+    (setq font-lock-comment-face 'Firebrick)
+    (setq font-lock-string-face 'RosyBrown)
+    (setq font-lock-keyword-face 'Purple)
+    (setq font-lock-function-name-face 'MidnightBlue)
+    (setq font-lock-variable-name-face 'DarkGoldenRod)
+    (setq font-lock-type-face 'DarkOliveGreen)
+    (setq font-lock-reference-face 'CadetBlue)))
+  ; extra faces for documention
   (make-face 'Stop)
   (set-face-foreground 'Stop "White")
   (set-face-background 'Stop "Red")
   (make-face 'Doc)
   (set-face-foreground 'Doc "Red")
-  ; assign them as standard faces
-  (setq font-lock-comment-face 'Firebrick)
-  (setq font-lock-string-face 'RosyBrown)
-  (setq font-lock-keyword-face 'Purple)
-  (setq font-lock-function-name-face 'MidnightBlue)
-  (setq font-lock-variable-name-face 'DarkGoldenRod)
-  (setq font-lock-type-face 'DarkOliveGreen)
-  (setq font-lock-reference-face 'CadetBlue)
   (setq font-lock-stop-face 'Stop)
   (setq font-lock-doccomment-face 'Doc)
 ))