aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1995-05-18 22:22:33 +0000
committerKarl Heuer1995-05-18 22:22:33 +0000
commitca58b3ecc69741bbea351a9bded63fe99278ac68 (patch)
treed2325ddbc4eb54ddda288a59a3651e50eecf6f6c
parentf3af6ec0bc15426d5cf092540a513f38d22a387e (diff)
downloademacs-ca58b3ecc69741bbea351a9bded63fe99278ac68.tar.gz
emacs-ca58b3ecc69741bbea351a9bded63fe99278ac68.zip
Put property on set-face-stipple, not set-stipple.
(face-fill-in): Handle stipple.
-rw-r--r--lisp/faces.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index e1d49486a9d..c5ab9b6623f 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -37,7 +37,7 @@
37 (put 'set-face-font 'byte-optimizer nil) 37 (put 'set-face-font 'byte-optimizer nil)
38 (put 'set-face-foreground 'byte-optimizer nil) 38 (put 'set-face-foreground 'byte-optimizer nil)
39 (put 'set-face-background 'byte-optimizer nil) 39 (put 'set-face-background 'byte-optimizer nil)
40 (put 'set-stipple 'byte-optimizer nil) 40 (put 'set-face-stipple 'byte-optimizer nil)
41 (put 'set-face-underline-p 'byte-optimizer nil)) 41 (put 'set-face-underline-p 'byte-optimizer nil))
42 42
43;;;; Functions for manipulating face vectors. 43;;;; Functions for manipulating face vectors.
@@ -1052,7 +1052,8 @@ selected frame."
1052 (condition-case nil 1052 (condition-case nil
1053 (let ((foreground (face-foreground data)) 1053 (let ((foreground (face-foreground data))
1054 (background (face-background data)) 1054 (background (face-background data))
1055 (font (face-font data))) 1055 (font (face-font data))
1056 (stipple (face-stipple data)))
1056 (set-face-underline-p face (face-underline-p data) frame) 1057 (set-face-underline-p face (face-underline-p data) frame)
1057 (if foreground 1058 (if foreground
1058 (face-try-color-list 'set-face-foreground 1059 (face-try-color-list 'set-face-foreground
@@ -1070,7 +1071,9 @@ selected frame."
1070 (italic 1071 (italic
1071 (make-face-italic face frame)))) 1072 (make-face-italic face frame))))
1072 (if font 1073 (if font
1073 (set-face-font face font frame)))) 1074 (set-face-font face font frame)))
1075 (if stipple
1076 (set-face-stipple face stipple frame)))
1074 (error nil))) 1077 (error nil)))
1075 1078
1076;; Assuming COLOR is a valid color name, 1079;; Assuming COLOR is a valid color name,