emacs: errors about auto-complete

[oandrieu]

I do not have the auto-complete package and merlin.el complains a bit:

--- /home/oandrieu/Downloads/merlin.el  2013-02-21 11:16:47.391076941 +0100
+++ /home/oandrieu/.opam/system/share/emacs/site-lisp/merlin.el 2013-02-21 11:09:54.597652168 +0100
@@ -419,7 +419,8 @@
     (requires . 3)
     ))

-(ac-define-source "merlin" merlin-ac-source)
+(when (featurep 'auto-complete)
+  (ac-define-source "merlin" merlin-ac-source))

 ;; Get the type of an element"
 (defun merlin-trim (s)
@@ -584,7 +585,8 @@
   (interactive)
   (progn
     (merlin-start-process)
-    (auto-complete-mode)
+    (when (featurep 'auto-complete)
+      (auto-complete-mode))
     (set (make-local-variable 'merlin-lock-point) (point-min))
     (set (make-local-variable 'merlin-buffer) nil)
     (set (make-local-variable 'merlin-result) nil)

[asmanur]

Hi,

Thanks for the patch, it is available in master.