 
 ;; Variable the user can change
 (defvar merlin-command "ocamlmerlin"
-  "The command for ocamlmerlin in your installation")
+  "The command for ocamlmerlin in your installation.")
 (defvar merlin-continuous-feed nil
-  "If set to t, each time you hit RET, the line is fed to merlin")
+  "If non-nil, each time you hit RET, the line is fed to merlin.")
 (defvar merlin-completion-types t
-  "Prints the types of the variables during completion")
+  "If non-nil, print the types of the variables during completion.")
 (defvar merlin-debug nil
-  "If true, logs the data sent and received from merlin")
+  "If non-nil, log the data sent and received from merlin")
 (defvar merlin-report-warnings t
-  "Should merlin care about warnings ?")
+  "If non-nil, report warnings.")
+
 (defvar merlin-favourite-caml-mode
   'tuareg-mode
-  "The OCaml mode to use for the *merlin types* buffer")
+  "The OCaml mode to use for the *merlin types* buffer.")
 (defvar merlin-idle-delay 3.0
-  "Number of seconds of idle time to wait before printing the type of the ident under the point.
+  "Seconds of idle time to wait before printing the type of the current ident.
 If user input arrives before this interval of time has elapsed
 after the last input, no documentation will be printed.
 

	(setq merlin-ready t)))))

(defun merlin-wait-for-answer ()
  "Waits for merlin to answer"
  (with-current-buffer (merlin-get-process-buffer-name)
    (let ((times 0))
      (while

      (setq merlin-ready nil))))

(defun merlin-start-process ()
  "Start the merlin process for the current buffer."
  (let ((p (start-process (merlin-get-process-name)
			 (merlin-get-process-buffer-name)
			 merlin-command))
