aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-04-14 09:31:18 +0000
committerRichard M. Stallman1994-04-14 09:31:18 +0000
commit586ab698cf75c114c85db9ae1534d24ed177a309 (patch)
treeea1f62bfdcb79ca8fdf5717b73c38dbe682254b4
parentecf7de9bebb2074dc291a6072b1db924e528529e (diff)
downloademacs-586ab698cf75c114c85db9ae1534d24ed177a309.tar.gz
emacs-586ab698cf75c114c85db9ae1534d24ed177a309.zip
(make-face-x-resource-internal): Don't mess with terminal frames.
-rw-r--r--lisp/faces.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 38d81e9eae6..06f3c4bdc3e 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -238,8 +238,9 @@ If the face already exists, it is unmodified."
238 (cond ((null frame) 238 (cond ((null frame)
239 (let ((frames (frame-list))) 239 (let ((frames (frame-list)))
240 (while frames 240 (while frames
241 (make-face-x-resource-internal (face-name face) 241 (if (eq (framep (car frames)) 'x)
242 (car frames) set-anyway) 242 (make-face-x-resource-internal (face-name face)
243 (car frames) set-anyway))
243 (setq frames (cdr frames))))) 244 (setq frames (cdr frames)))))
244 (t 245 (t
245 (setq face (internal-get-face (face-name face) frame)) 246 (setq face (internal-get-face (face-name face) frame))