fix(lookup): +lookup/online for vertico users
Would formerly throw wrong-number-of-args errors.
This commit is contained in:
parent
910230d14d
commit
3bd358dc36
1 changed files with 21 additions and 24 deletions
|
@ -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))
|
(cond ((stringp backend)
|
||||||
(condition-case-unless-debug e
|
(funcall +lookup-open-url-fn
|
||||||
(progn
|
(format backend
|
||||||
(unless query
|
(url-encode-url
|
||||||
(setq query
|
(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"))
|
(error
|
||||||
(funcall +lookup-open-url-fn (format backend (url-encode-url query))))
|
(delq! major-mode +lookup--last-provider 'assq)
|
||||||
(error
|
(signal (car e) (cdr e))))
|
||||||
(setq +lookup--last-provider
|
(throw 'done t)))))))
|
||||||
(delq (assq major-mode +lookup--last-provider)
|
|
||||||
+lookup--last-provider))
|
|
||||||
(signal (car e) (cdr e)))))))
|
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun +lookup/online-select ()
|
(defun +lookup/online-select ()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue