   "Overlay used for the lock zone highlighting.")
 (make-variable-buffer-local 'merlin-lock-zone-highlight-overlay)
 
-(defvar merlin-lock-zone-margin-overlay nil
-  "Overlay used for the margin indicator of the lock zone.")
-(make-variable-buffer-local 'merlin-lock-zone-margin-overlay)
+(defvar merlin-lock-zone-fringe-overlay nil
+  "Overlay used for the fringe indicator of the lock zone.")
+(make-variable-buffer-local 'merlin-lock-zone-fringe-overlay)
 
 ;; Errors related variables
 (defvar merlin-pending-errors nil

If a string list, check only if the extension of the buffer-file-name is in the list."
  :group 'merlin :type '(choice (repeat string) boolean))

(defcustom merlin-error-in-margin t
  "If non-nil, display errors in margin"
  :group 'merlin :type 'boolean)

(defcustom merlin-display-lock-zone nil
  "How to display the locked zone.
It is a list of methods among:
   - `highlight': highlight the current locked zone (like proofgeneral)
   - `margin': put a symbol (given by `merlin-margin-lock-string') in the margin
     of the line where the zone ends.

In particular you can specify nil, meaning that the locked zone is not represented on the screen."
  :group 'merlin :type '(repeat
                         (choice (const :tag "Highlight the locked zone" highlight)
                                 (const :tag "Display a marker in the left margin at the end of the locked zone" margin))))

(defcustom merlin-default-flags nil
  "The flags to give to ocamlmerlin."

  "The OCaml mode to use for the *merlin-types* buffer."
  :group 'merlin :type 'symbol)

(defcustom merlin-error-after-save '("ml" "mli")
  "Determines whether merlin should check for errors after saving.
If t, always check for errors after saving.
