 ;;    (define-key merlin-menu-map [customize]
 ;;      '("Customize merlin-mode" . merlin-customize))
     (define-key merlin-menu-map [separator]
-      '("--"))
+      '("-"))
     (define-key merlin-show-type-map [local]
       '(menu-item "around the cursor" merlin-magic-show-type
                   :help "Show the type of the smallest subexpression near cursor"))

  (set (make-local-variable 'merlin-pending-errors-overlays) nil)
  (set (make-local-variable 'merlin-lock-zone-highlight-overlay) nil)
  (set (make-local-variable 'merlin-lock-zone-margin-overlay) nil)
  (set (make-local-variable 'merlin--project-file) nil)
  (set (make-local-variable 'merlin-enclosing-types) nil)
  (set (make-local-variable 'merlin-enclosing-offset) nil)
  (set (make-local-variable 'merlin-last-point-type) nil)

     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."
  :group 'merlin :type '(repeat string))
(defcustom merlin-automatically-garbage-processes t
  "If non-nil, deletes a process when it has no more users. If nil, keep it."
  :group 'merlin :type 'boolean)
(defcustom merlin-rewind-after-refresh t
  "If non-nil, rewind the buffer after refresh"
  :group 'merlin :type 'boolean)
(defcustom merlin-use-auto-complete-mode nil
  "If non nil, use `auto-complete-mode' in any buffer"
  :group 'merlin :type 'boolean)

;;;;;;;;;;;;;;;;;;;;;
;; Internal variables
;;;;;;;;;;;;;;;;;;;;;


;; merlin flags
(defvar merlin-flags-list '("-rectypes" "-nostdlib" "-absname" "-w" )
  "List of flags that can be passed to ocamlmerlin")
(defvar merlin-current-flags nil
  "The current list of flags to pass to ocamlmerlin")

;; Process / Reception related variables
(defvar merlin-processes nil
  "The global merlin process table. It lists the active instances of merlin.")
(defvar merlin-local-process nil
  "The local merlin process.")
(defvar merlin-queue nil
  "The transaction queue for current process. This variable lives only in process buffers.")
(defvar merlin-process-users nil
  "Buffer that uses the process (local to a process buffer).")
(defvar merlin-process-last-user nil
  "Last buffer that used the process.")
(defvar merlin-result nil
  "Temporary variables to store command results.")
(defvar merlin-buffer nil "Buffer for merlin input.")
(defvar merlin-ready nil "If non-nil, the reception is done.")

;; Overlays
(defvar merlin-lock-zone-highlight-overlay nil 
  "Overlay used for the lock zone highlighting.")
(defvar merlin-lock-zone-margin-overlay nil 
  "Overlay used for the margin indicator of the lock zone.")


;; Errors related variables
(defvar merlin-pending-errors nil
  "Pending errors.")
(defvar merlin-lock-point 0
