Merge commit 'fb1801ff24b09adc816ef763c9db9cd4b1b5d9dd' from swiper

[gnu-emacs-elpa] / packages / swiper / ivy.el

diff --git a/packages/swiper/ivy.el b/packages/swiper/ivy.el
index e98dd85dbb14cf13daea8ad7e39b4c6841c7f1ff..de556ca0354e029ac38226a4ddd6af30077da507 100644 (file)
--- a/packages/swiper/ivy.el
+++ b/packages/swiper/ivy.el
@@ -256,7 +256,15 @@ the ones that match INITIAL-INPUT.
 
 UPDATE-FN is called each time the current candidate(s) is changed."
   (setq ivy--directory nil)
-  (cond ((eq collection 'read-file-name-internal)
+  (cond ((eq collection 'Info-read-node-name-1)
+         (if (equal Info-current-file "dir")
+             (setq collection
+                   (mapcar (lambda (x) (format "(%s)" x))
+                           (cl-delete-duplicates
+                            (all-completions "(" collection predicate)
+                            :test 'equal)))
+           (setq collection (all-completions "" collection predicate))))
+        ((eq collection 'read-file-name-internal)
          (setq ivy--directory default-directory)
          (setq initial-input nil)
          (setq collection