(face-valid-attribute-values): Make sure directories we search for

  stipples both exist and are readable before trying to search them.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4508a7e22e06d48dd0618776f8f089f724515847..3eeff7298cb16af42bccebeb8d684b1f47410128 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2000-09-20  Miles Bader  <miles@lsi.nec.co.jp>
 
+       * faces.el (face-valid-attribute-values): Make sure directories we
+       search for stipples both exist and are readable before trying to
+       search them.
+
        * diff-mode.el (diff-apply-hunk): Jump to the correct line offset
        in the dry-run case.
 

diff --git a/lisp/faces.el b/lisp/faces.el
index bcb8c6e3871ea4b14029d662e2c2deac917304db..f290a81566992242192bb9a0beaa4fd1501bee76 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -779,8 +779,12 @@ an integer value."
            (:stipple
             (and (memq window-system '(x w32))
                  (mapcar #'list
-                         (apply #'nconc (mapcar #'directory-files
-                                                x-bitmap-file-path)))))
+                         (apply #'nconc
+                                (mapcar (lambda (dir)
+                                          (and (file-readable-p dir)
+                                               (file-directory-p dir)
+                                               (directory-files dir)))
+                                        x-bitmap-file-path)))))
            (:inherit
             (cons '("none" . nil)
                   (mapcar #'(lambda (c) (cons (symbol-name c) c))