fix(lookup): +lookup/online for vertico users

Would formerly throw wrong-number-of-args errors.
This commit is contained in:
Henrik Lissner 2021-10-18 01:24:28 +02:00
parent 910230d14d
commit 3bd358dc36

View file

@ -36,30 +36,27 @@ QUERY must be a string, and PROVIDER must be a key of
(interactive (interactive
(list (if (use-region-p) (doom-thing-at-point-or-region)) (list (if (use-region-p) (doom-thing-at-point-or-region))
(+lookup--online-provider current-prefix-arg))) (+lookup--online-provider current-prefix-arg)))
(let ((backend (cl-find-if (lambda (x) (or (stringp x) (fboundp x))) (let ((backends (cdr (assoc provider +lookup-provider-url-alist))))
(cdr (assoc provider +lookup-provider-url-alist))))) (unless backends
(unless (and (functionp backend) (user-error "No available online lookup backend for %S provider"
(funcall backend query)) provider))
(unless backend (catch 'done
(user-error "%S is an invalid query engine backend for %S provider" (dolist (backend backends)
backend provider))
(cl-check-type backend (or string function)) (cl-check-type backend (or string function))
(condition-case-unless-debug e (cond ((stringp backend)
(progn (funcall +lookup-open-url-fn
(unless query (format backend
(setq query (url-encode-url
(or query
(read-string (format "Search for (on %s): " provider) (read-string (format "Search for (on %s): " provider)
(thing-at-point 'symbol t)))) (thing-at-point 'symbol t)))))))
(when (or (functionp backend) (symbolp backend)) ((condition-case-unless-debug e
(setq backend (funcall backend))) (and (fboundp backend)
(when (string-empty-p query) (funcall backend query))
(user-error "The query query is empty"))
(funcall +lookup-open-url-fn (format backend (url-encode-url query))))
(error (error
(setq +lookup--last-provider (delq! major-mode +lookup--last-provider 'assq)
(delq (assq major-mode +lookup--last-provider) (signal (car e) (cdr e))))
+lookup--last-provider)) (throw 'done t)))))))
(signal (car e) (cdr e)))))))
;;;###autoload ;;;###autoload
(defun +lookup/online-select () (defun +lookup/online-select ()