summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/faces.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 5e525e79531..ee4a95eb574 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1151,13 +1151,14 @@ an integer value."
(:height
'integerp)
(:stipple
- (and (memq (window-system frame) '(x ns)) ; No stipple on w32
- (mapcar #'list
+ (and (memq (window-system frame) '(x ns pgtk)) ; No stipple on w32
+ (mapcar (lambda (f)
+ (cons (file-name-base f) f))
(apply #'nconc
(mapcar (lambda (dir)
(and (file-readable-p dir)
(file-directory-p dir)
- (directory-files dir)))
+ (directory-files dir 'full)))
x-bitmap-file-path)))))
(:inherit
(cons '("none" . nil)