Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ivy.el: Work around void Info-complete-menu-buffer #1814

Merged
merged 1 commit into from Nov 22, 2018
Merged

ivy.el: Work around void Info-complete-menu-buffer #1814

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions ivy.el
View file
Open in desktop
Expand Up @@ -1881,6 +1881,8 @@ customizations apply to the current completion session."
ivy-display-functions-props))
prop))

(defvar Info-complete-menu-buffer)

(defun ivy--reset-state (state)
"Reset the ivy to STATE.
This is useful for recursive `ivy-read'."
Expand Down Expand Up @@ -1920,7 +1922,6 @@ This is useful for recursive `ivy-read'."
#'ivy--highlight-default))
(let (coll sort-fn)
(cond ((eq collection #'Info-read-node-name-1)
(setq Info-read-node-completion-table nil)
(setq coll
(if (equal (bound-and-true-p Info-current-file) "dir")
(mapcar (lambda (x) (format "(%s)" x))
Expand Down Expand Up @@ -1994,7 +1995,11 @@ This is useful for recursive `ivy-read'."
(vectorp collection)
(hash-table-p collection)
(and (listp collection) (symbolp (car collection))))
(setq coll (all-completions "" collection predicate)))
(let ((Info-complete-menu-buffer
;; FIXME: This is a temporary workaround for issue #1803.
(or (bound-and-true-p Info-complete-menu-buffer)
(ivy-state-buffer state))))
(setq coll (all-completions "" collection predicate))))
(t
(setq coll
(if predicate
Expand Down