changeset 31753:7d6ee5c362b2

(face-valid-attribute-values): Make sure directories we search for stipples both exist and are readable before trying to search them.
author Miles Bader <miles@gnu.org>
date Wed, 20 Sep 2000 07:42:14 +0000
parents 60d9ac2802eb
children 5c9c08a66da8
files lisp/faces.el
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/faces.el	Wed Sep 20 07:18:35 2000 +0000
+++ b/lisp/faces.el	Wed Sep 20 07:42:14 2000 +0000
@@ -779,8 +779,12 @@
 	    (: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))