emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor, general refactor of lookup autoload library

Browse source
This commit is contained in:
Henrik Lissner 2018-06-20 15:52:26 +02:00
parent 65b2d5eb28
commit 17678992e2
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/feature/lookup/autoload/lookup.el
View file

@ -168,7 +168,7 @@ evil-mode is active."
(not (and (>= pt beg) (not (and (>= pt beg)
(< pt end))))))) (< pt end)))))))
(t (user-error "Couldn't find '%s'" identifier)))) ((error "Couldn't find '%s'" identifier))))
;;;###autoload ;;;###autoload
(defun +lookup/references (identifier) (defun +lookup/references (identifier)
@ -184,7 +184,7 @@ search otherwise."
((+lookup--file-search identifier)) ((+lookup--file-search identifier))
(t (error "Couldn't find '%s'" identifier)))) ((error "Couldn't find '%s'" identifier))))
;;;###autoload ;;;###autoload
(defun +lookup/documentation (identifier) (defun +lookup/documentation (identifier)
@ -287,8 +287,7 @@ Otherwise, falls back on `find-file-at-point'."
(helm-dash query)) (helm-dash query))
((featurep! :completion ivy) ((featurep! :completion ivy)
(counsel-dash query)) (counsel-dash query))
(t ((user-error "No dash backend is installed, enable ivy or helm.")))))
(user-error "No dash backend is installed, enable ivy or helm.")))))
;;;###autoload ;;;###autoload
(defun +lookup/online (search &optional provider) (defun +lookup/online (search &optional provider)
@ -306,19 +305,19 @@ for the provider."
(region-end))) (region-end)))
(read-string "Search for: " (thing-at-point 'symbol t))) (read-string "Search for: " (thing-at-point 'symbol t)))
(+lookup--online-provider current-prefix-arg))) (+lookup--online-provider current-prefix-arg)))
(condition-case ex (condition-case-unless-debug e
(let ((url (cdr (assoc provider +lookup-provider-url-alist)))) (let ((url (cdr (assoc provider +lookup-provider-url-alist))))
(unless url (unless url
(error "'%s' is an invalid search engine" provider)) (user-error "'%s' is an invalid search engine" provider))
(when (or (functionp url) (symbolp url)) (when (or (functionp url) (symbolp url))
(setq url (funcall url))) (setq url (funcall url)))
(cl-assert (and (stringp url) (not (string-empty-p url)))) (cl-assert (and (stringp url) (not (string-empty-p url))))
(when (string-empty-p search) (when (string-empty-p search)
(user-error "The search query is empty")) (user-error "The search query is empty"))
(funcall +lookup-open-url-fn (format url (url-encode-url search)))) (funcall +lookup-open-url-fn (format url (url-encode-url search))))
('error (error
(map-delete +lookup--last-provider major-mode) (map-delete +lookup--last-provider major-mode)
(message "Failed: %s" ex)))) (signal (car e) (cdr e)))))
;;;###autoload ;;;###autoload
(defun +lookup/online-select () (defun +lookup/online-select ()