Mercurial > emacs
comparison lisp/cus-face.el @ 91304:c938ab6810a4
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-308
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 02 Jan 2008 04:13:39 +0000 |
parents | 14c4a6aac623 0ef4914a2852 |
children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
91303:1ae1f4066439 | 91304:c938ab6810a4 |
---|---|
44 (have-window-system (memq initial-window-system '(x w32)))) | 44 (have-window-system (memq initial-window-system '(x w32)))) |
45 ;; Create global face. | 45 ;; Create global face. |
46 (make-empty-face face) | 46 (make-empty-face face) |
47 ;; Create frame-local faces | 47 ;; Create frame-local faces |
48 (dolist (frame (frame-list)) | 48 (dolist (frame (frame-list)) |
49 (face-spec-set face value frame) | 49 (face-spec-set-2 face frame value) |
50 (when (memq (window-system frame) '(x w32 mac)) | 50 (when (memq (window-system frame) '(x w32 mac)) |
51 (setq have-window-system t))) | 51 (setq have-window-system t))) |
52 ;; When making a face after frames already exist | 52 ;; When making a face after frames already exist |
53 (if have-window-system | 53 (if have-window-system |
54 (make-face-x-resource-internal face))))) | 54 (make-face-x-resource-internal face))))) |
340 (put face 'force-face (if now 'rogue 'immediate))) | 340 (put face 'force-face (if now 'rogue 'immediate))) |
341 (when (or now immediate (facep face)) | 341 (when (or now immediate (facep face)) |
342 (unless (facep face) | 342 (unless (facep face) |
343 (make-empty-face face)) | 343 (make-empty-face face)) |
344 (put face 'face-comment comment) | 344 (put face 'face-comment comment) |
345 (face-spec-set face spec nil)) | 345 (put face 'face-override-spec nil) |
346 (face-spec-set face spec t)) | |
346 (setq args (cdr args))) | 347 (setq args (cdr args))) |
347 ;; Old format, a plist of FACE SPEC pairs. | 348 ;; Old format, a plist of FACE SPEC pairs. |
348 (let ((face (nth 0 args)) | 349 (let ((face (nth 0 args)) |
349 (spec (nth 1 args))) | 350 (spec (nth 1 args))) |
350 (if (get face 'face-alias) | 351 (if (get face 'face-alias) |