 	  (json-encode 
 	   (if args (append (list name) args) (list name)))
 	  "\n")))
-;    (message string)
+    (if merlin-debug (message string))
     (set (make-local-variable 'merlin-continuation) callback)
     (process-send-string (merlin-get-process) string)
     (merlin-wait-for-answer)


(defun merlin-filter (process output)
  "The filter on merlin's output"
  (if merlin-continuation
      (let ((a (ignore-errors (json-read-from-string output))))
	(if a (funcall merlin-continuation a)))))

(defvar merlin-point nil
  "Stores the point of last completion")

(defvar merlin-debug t)
(defvar merlin-type-buffer (get-buffer-create "*merlin types*"))

(defun merlin-make-buffer-name ()
