summaryrefslogtreecommitdiff
path: root/lisp/faces.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-07-18 13:27:49 +0000
committerRichard M. Stallman <rms@gnu.org>1995-07-18 13:27:49 +0000
commit3d79b3eb9b0b1547fbbd7bd4c8dc7177a1cf2076 (patch)
treed297b8ca229b43186c00489505e5a8fbc29ef324 /lisp/faces.el
parentcdf5444a18449857b89c4e0bb66405cc42455205 (diff)
downloademacs-3d79b3eb9b0b1547fbbd7bd4c8dc7177a1cf2076.tar.gz
(x-create-frame-with-faces):
Specify frame arg to x-color-values and frame-parameters. (set-face-background): Pass background-p arg to face-color-supported-p.
Diffstat (limited to 'lisp/faces.el')
-rw-r--r--lisp/faces.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 637170cc457..04dc3c9a2fb 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -150,7 +150,7 @@ in that frame; otherwise change each frame."
;; For a specific frame, use gray stipple instead of gray color
;; if the display does not support a gray color.
(if (and frame (not (eq frame t))
- (not (face-color-supported-p frame color)))
+ (not (face-color-supported-p frame color t)))
(set-face-stipple face face-default-stipple frame)
(if (null frame)
(let ((frames (frame-list)))
@@ -1065,13 +1065,14 @@ selected frame."
;; on this frame.
(let ((bg-resource (x-get-resource ".backgroundMode"
"BackgroundMode"))
- (params (frame-parameters))
+ (params (frame-parameters frame))
(bg-mode))
(setq bg-mode
(cond (bg-resource (intern (downcase bg-resource)))
((< (apply '+ (x-color-values
- (cdr (assq 'background-color params))))
- (/ (apply '+ (x-color-values "white")) 3))
+ (cdr (assq 'background-color params))
+ frame))
+ (/ (apply '+ (x-color-values "white" frame)) 3))
'dark)
(t 'light)))
(modify-frame-parameters frame