Fix multiple-definition of merlin--search

ocaml · Sep 19, 2024 · d669f70 · d669f70
1 parent af635ff
commit d669f70
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/emacs/merlin.el b/emacs/merlin.el
@@ -1200,7 +1200,7 @@ An ocaml atom is any string containing [a-z_0-9A-Z`.]."
 (defun merlin--is-polarity-query (query)
   (or (string-prefix-p "-" query) (string-prefix-p "+" query)))
 
-(defun merlin--search (query)
+(defun merlin--search-polarity-or-by-type (query)
   (interactive "sSearch query: ")
   (if (merlin--is-polarity-query query)
       (merlin-search-by-polarity query)
@@ -1234,7 +1234,7 @@ An ocaml atom is any string containing [a-z_0-9A-Z`.]."
   (if (use-region-p)
       (let ((query (buffer-substring start end)))
 	(merlin--perform-search-completion query start end))
-    (call-interactively #'merlin--search)))
+    (call-interactively #'merlin--search-polarity-or-by-type)))
 
 ;;;;;;;;;;;;;;;;;
 ;; TYPE BUFFER ;;