104 lines
4.1 KiB
Diff
104 lines
4.1 KiB
Diff
Fixes these warnings:
|
|
|
|
In ac-merlin-locate:
|
|
merlin-ac.el:142:8:Warning: merlin-locate called with 1 argument, but accepts
|
|
only 0
|
|
|
|
In toplevel form:
|
|
merlin-cap.el:30:1:Warning: Unused lexical argument `state'
|
|
|
|
In merlin-company-backend:
|
|
merlin-company.el:112:23:Warning: merlin-locate called with 1 argument, but
|
|
accepts only 0
|
|
Iedit default key binding is C-;
|
|
|
|
In toplevel form:
|
|
merlin-iedit.el:49:1:Warning: Unused lexical argument `c'
|
|
merlin-iedit.el:49:1:Warning: Unused lexical argument `b'
|
|
|
|
In toplevel form:
|
|
merlin-xref.el:16:1:Warning: Unused lexical argument `symbol'
|
|
merlin-xref.el:24:1:Warning: Unused lexical argument `symbol'
|
|
|
|
In end of data:
|
|
merlin.el:1924:1:Warning: the following functions are not known to be defined:
|
|
first, rest
|
|
|
|
--- a/emacs/merlin-ac.el 2021-04-13 02:53:39.000000000 -0600
|
|
+++ b/emacs/merlin-ac.el 2021-04-13 14:15:33.735325907 -0600
|
|
@@ -139,7 +139,7 @@ wrong then recompute it."
|
|
(when (popup-hidden-p ac-menu)
|
|
(ac-show-menu))
|
|
(let ((merlin-locate-in-new-window 'always))
|
|
- (merlin-locate (ac-selected-candidate)))
|
|
+ (merlin-locate-ident (ac-selected-candidate)))
|
|
(ac-show-menu)))
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
--- a/emacs/merlin-cap.el 2021-04-13 02:53:39.000000000 -0600
|
|
+++ b/emacs/merlin-cap.el 2021-04-13 14:18:43.383116394 -0600
|
|
@@ -27,7 +27,7 @@ trigger useless merlin calls.")
|
|
|
|
;; Internal functions
|
|
|
|
-(defun merlin-cap--lookup (string state)
|
|
+(defun merlin-cap--lookup (string _state)
|
|
"Lookup the entry STRING inside the completion table."
|
|
(let ((ret (assoc string merlin-cap--table)))
|
|
(if ret (message "%s%s" (car ret) (cdr ret)))))
|
|
--- a/emacs/merlin-company.el 2021-04-13 02:53:39.000000000 -0600
|
|
+++ b/emacs/merlin-company.el 2021-04-13 14:32:00.527211921 -0600
|
|
@@ -109,7 +109,7 @@
|
|
(doc-buffer (merlin-company--doc-buffer arg))
|
|
(location
|
|
(ignore-errors
|
|
- (let ((data (merlin-locate arg)))
|
|
+ (let ((data (merlin-locate-ident arg)))
|
|
(when (listp data)
|
|
(let ((filename (merlin-lookup 'file data (buffer-file-name)))
|
|
(linum (cdr (assoc 'line (assoc 'pos data)))))
|
|
--- a/emacs/merlin.el 2021-04-13 02:53:39.000000000 -0600
|
|
+++ b/emacs/merlin.el 2021-04-13 14:11:50.200586231 -0600
|
|
@@ -1267,8 +1267,8 @@ strictly within, or nil if there is no s
|
|
"Returns the first `hole` of the list such that
|
|
`(funcall comp hole current-point)`"
|
|
(when holes
|
|
- (let* ((head (first holes))
|
|
- (tail (rest holes))
|
|
+ (let* ((head (cl-first holes))
|
|
+ (tail (cl-rest holes))
|
|
(start (merlin-lookup 'start head))
|
|
(hole-point (merlin-make-point start)))
|
|
(if (funcall comp hole-point current-point)
|
|
--- a/emacs/merlin-iedit.el 2021-04-13 02:53:39.000000000 -0600
|
|
+++ b/emacs/merlin-iedit.el 2021-04-13 14:19:18.000078147 -0600
|
|
@@ -56,7 +56,7 @@
|
|
(if (listp r)
|
|
(cl-letf (((symbol-function 'iedit-printable) #'merlin-iedit--printable)
|
|
((symbol-function 'iedit-make-occurrences-overlays)
|
|
- (lambda (a b c)
|
|
+ (lambda (a _b _c)
|
|
(merlin-iedit--make-occurrences-overlays a))))
|
|
(iedit-start r (point-min) (point-max)))
|
|
(message r))))))
|
|
--- a/emacs/merlin-xref.el 2021-04-13 02:53:39.000000000 -0600
|
|
+++ b/emacs/merlin-xref.el 2021-04-13 14:19:51.431041212 -0600
|
|
@@ -13,7 +13,7 @@
|
|
(goto-char loc)
|
|
(buffer-substring (line-beginning-position) (line-end-position))))
|
|
|
|
-(cl-defmethod xref-backend-references ((_backend (eql merlin-xref)) symbol)
|
|
+(cl-defmethod xref-backend-references ((_backend (eql merlin-xref)) _symbol)
|
|
(mapcar
|
|
(lambda (loc)
|
|
(let ((pt (merlin-make-point (alist-get 'start loc))))
|
|
@@ -21,7 +21,7 @@
|
|
(xref-make-buffer-location (current-buffer) pt))))
|
|
(merlin--occurrences)))
|
|
|
|
-(cl-defmethod xref-backend-definitions ((_backend (eql merlin-xref)) symbol)
|
|
+(cl-defmethod xref-backend-definitions ((_backend (eql merlin-xref)) _symbol)
|
|
(let* ((loc (merlin-locate))
|
|
(file (alist-get 'file loc))
|
|
(pos (alist-get 'pos loc))
|