2 files changed, 2 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 45096e52ec0..c73b1d6a372 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
 2011-01-16  Glenn Morris  <rgm@gnu.org>
 
         * info-xref.el (info-xref-docstrings): Replace cl function.
+        Also skip directories.
 
 2011-01-16  Kevin Ryde  <user42@zip.com.au>
 
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index cdeba932eda..e317b10bcd6 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -493,6 +493,7 @@ the sources handy."
      (setq filename-list
            (dolist (file filename-list (nreverse newlist))
              (or (info-xref-lock-file-p file)
+                 (file-directory-p file)
                  (push file newlist))))
      (unless filename-list
        (error "No files: %S" pattern))