 (defcustom merlin-margin-warning-string "?"
   "String to put in the margin of a line containing a warning."
   :group 'merlin :type 'string)
+
+(defcustom merlin-error-after-save t
+  "If non-nil, check for errors after saving"
+  :group 'merlin :type '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.

                                           merlin-margin-error-string
                                           compilation-error-face))
              overlay)))
         (errors   (mapcar err-point errors))
         (overlays (mapcar err-overlay errors)))
    (setq merlin-pending-errors errors)
    (setq merlin-pending-errors-overlays overlays)))

(defun merlin-error-check (view-errors-p)
  "Check for errors.

  (when merlin-mode
    (merlin-process-remove-user)))

(defun merlin-after-save ()
  (when merlin-error-after-save (merlin-to-end)))

(add-hook 'merlin-mode-hook
          (lambda ()
            (add-hook 'kill-buffer-hook 'merlin-kill-buffer-hook
                      nil 'make-it-local)
            (add-hook 'after-save-hook 'merlin-after-save
                      nil 'make-it-local)
            (add-hook 'pre-command-hook
                      'merlin-show-current-error nil 'make-it-local)
            (add-hook 'post-command-hook
