From: Miles Bader <miles@gnu.org>
Date: Wed, 20 Sep 2000 07:42:51 +0000 (+0000)
Subject: (face-valid-attribute-values): Make sure directories we search for
X-Git-Tag: emacs-pretest-21.0.90~1499
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=37a99821999c7198aeff9bb68b159c3e5fcf1b60;p=emacs.git

(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 4508a7e22e0..3eeff7298cb 100644
--- 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 bcb8c6e3871..f290a815669 100644
--- 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))