 (defcustom merlin-locate-focus-new-window t
   "If non-nil, when locate opens a new window it will give it the focus."
   :group 'merlin :type 'boolean)
-
-(defcustom merlin-compilation-warning-face 'compilation-warning-face
-  "If non-nil, face to use to highlight merlin warnings."
-  :group 'merlin :type '(choice symbol (const :tag "Disable" nil)))
-
-(defcustom merlin-compilation-error-face 'compilation-error-face
-  "If non-nil, face to use to highlight merlin errors."
-  :group 'merlin :type '(choice symbol (const :tag "Disable" nil)))
-
 
 ;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Internal variables ;;

              (if (merlin-error-warning-p (cdr (assoc 'message err)))
                  (merlin-put-margin-overlay overlay
                                             merlin-margin-warning-string
                                             merlin-compilation-warning-face)
                (merlin-put-margin-overlay overlay
                                           merlin-margin-error-string
                                           merlin-compilation-error-face))
              overlay)))
         (errors   (mapcar err-point errors)))
    (setq merlin-pending-errors errors)

  :group 'merlin)

(defface merlin-type-face
  '((t :inherit caml-types-expr-face))
  "Face for highlighting a typed expr."
  :group 'merlin)

(defface merlin-compilation-warning-face
  '((t :inherit compilation-error))
  "If non-nil, face to use to highlight merlin warnings."
  :group 'merlin)

(defface merlin-compilation-error-face
  '((t :inherit compilation-warning))
  "If non-nil, face to use to highlight merlin errors."
  :group 'merlin)

;;
