Merge commit 'fb1801ff24b09adc816ef763c9db9cd4b1b5d9dd' from swiper

diff --git a/packages/swiper/counsel.el b/packages/swiper/counsel.el
index e7787c05e48984872c16b85bb9790f23a57f4f2a..c1b90d63445d78a6fc1eeab3e1081bd58e6a60bd 100644 (file)
--- a/packages/swiper/counsel.el
+++ b/packages/swiper/counsel.el
@@ -125,6 +125,7 @@
                                  (ucs-names)))))
     (insert-char (get-text-property 0 'result char))))
 
+(declare-function cider-sync-request:complete "ext:cider-client")
 (defun counsel-clj ()
   "Clojure completion at point."
   (interactive)
@@ -132,8 +133,7 @@
    (lambda (str)
      (mapcar
       #'cl-caddr
-      (with-no-warnings
-        (cider-sync-request:complete str ":same"))))))
+      (cider-sync-request:complete str ":same")))))
 
 (defun counsel-git ()
   "Find file in the current Git repository."

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

diff --git a/packages/swiper/swiper.el b/packages/swiper/swiper.el
index 96a029cec05dd09d4da660a3fb139749a9a7aa4d..d69e4aee62790bec0f78b13dceb262ae8e6ccf28 100644 (file)
--- a/packages/swiper/swiper.el
+++ b/packages/swiper/swiper.el
@@ -112,7 +112,8 @@
                                  gnus-article-mode
                                  gnus-group-mode
                                  emms-playlist-mode erc-mode
-                                 org-agenda-mode)))
+                                 org-agenda-mode
+                                 dired-mode)))
     (unless (> (buffer-size) 100000)
       (if (fboundp 'font-lock-ensure)
           (font-lock-ensure)