               (acons 'bounds bounds err))))
          (errors   (mapcar err-point errors)))
     (setq merlin-pending-errors errors)
-    (when merlin-error-in-margin
+    (when merlin-error-in-fringe
       (dolist (err errors)
         (let* ((bounds (cdr (assoc 'bounds err)))
                (overlay (make-overlay (car bounds) (cdr bounds))))

      (merlin-error-gc)
      (when merlin-lock-zone-highlight-overlay
        (delete-overlay merlin-lock-zone-highlight-overlay))
      (when merlin-lock-zone-margin-overlay
        (delete-overlay merlin-lock-zone-margin-overlay))
      (when merlin-highlight-overlay
        (delete-overlay merlin-highlight-overlay))
      ;;(merlin-error-delete-overlays)

;; POINT SYNCHRONIZATION ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;

(defun merlin-sync-fringe-lock-zone ()
  "Display the position of the lock zone by a marker in the fringe."
  (if merlin-lock-zone-fringe-overlay
      (delete-overlay merlin-lock-zone-fringe-overlay))
  (save-excursion
    (goto-char merlin-dirty-point)
    (setq merlin-lock-zone-fringe-overlay (make-overlay (point) (point)))
    (merlin-add-display-properties
     merlin-lock-zone-fringe-overlay
     'horizontal-bar
     "-")))

(defun merlin-sync-highlight-lock-zone ()
  "Mark the position of the lock zone by highlighting the zone."
