Otherwise report on the defaults for face FACE (for new frames)."
(aref (internal-get-face face frame) 5))
-(defsubst face-background-pixmap (face &optional frame)
- "Return the background pixmap name of face FACE, or nil if unspecified.
-If the optional argument FRAME is given, report on face FACE in that frame.
-Otherwise report on the defaults for face FACE (for new frames)."
- (aref (internal-get-face face frame) 6))
+;;(defsubst face-background-pixmap (face &optional frame)
+;; "Return the background pixmap name of face FACE, or nil if unspecified.
+;;If the optional argument FRAME is given, report on face FACE in that frame.
+;;Otherwise report on the defaults for face FACE (for new frames)."
+;; (aref (internal-get-face face frame) 6))
(defsubst face-underline-p (face &optional frame)
"Return t if face FACE is underlined.
(interactive (internal-face-interactive "background"))
(internal-set-face-1 face 'background color 5 frame))
-(defsubst set-face-background-pixmap (face name &optional frame)
- "Change the background pixmap of face FACE to PIXMAP.
-PIXMAP should be a string, the name of a file of pixmap data.
-The directories listed in the `x-bitmap-file-path' variable are searched.
+;;(defsubst set-face-background-pixmap (face name &optional frame)
+;; "Change the background pixmap of face FACE to PIXMAP.
+;;PIXMAP should be a string, the name of a file of pixmap data.
+;;The directories listed in the `x-bitmap-file-path' variable are searched.
-Alternatively, PIXMAP may be a list of the form (WIDTH HEIGHT DATA)
-where WIDTH and HEIGHT are the size in pixels,
-and DATA is a string, containing the raw bits of the bitmap.
+;;Alternatively, PIXMAP may be a list of the form (WIDTH HEIGHT DATA)
+;;where WIDTH and HEIGHT are the size in pixels,
+;;and DATA is a string, containing the raw bits of the bitmap.
-If the optional FRAME argument is provided, change only
-in that frame; otherwise change each frame."
- (interactive (internal-face-interactive "background-pixmap"))
- (internal-set-face-1 face 'background-pixmap name 6 frame))
+;;If the optional FRAME argument is provided, change only
+;;in that frame; otherwise change each frame."
+;; (interactive (internal-face-interactive "background-pixmap"))
+;; (internal-set-face-1 face 'background-pixmap name 6 frame))
(defsubst set-face-underline-p (face underline-p &optional frame)
"Specify whether face FACE is underlined. (Yes if UNDERLINE-P is non-nil.)
contains wildcards.
Given optional arguments FACE and FRAME, try to return a font which is
also the same size as FACE on FRAME."
+ (or (symbolp face)
+ (setq face (face-name face)))
+ (and (eq frame t)
+ (setq frame nil))
(if pattern
(let ((fonts (x-list-fonts pattern face frame)))
(or fonts
(if face
- (error "no fonts match `%S'." pattern)
- (error "no fonts matching pattern are the same size as `%s'."
- pattern face)))
+ (error "No fonts matching pattern are the same size as `%s'"
+ face)
+ (error "No fonts match `%s'" pattern)))
(car fonts))
(cdr (assq 'font (frame-parameters (selected-frame))))))
(face-font 'default frame)
(cdr (assq 'font (frame-parameters frame)))))
(or (and (setq f2 (x-make-font-bold font))
- (internal-try-face-font face f2))
+ (internal-try-face-font face f2 frame))
(and (setq f2 (x-make-font-demibold font))
- (internal-try-face-font face f2))))
+ (internal-try-face-font face f2 frame))))
(or (not (equal ofont (face-font face)))
(and (not noerror)
- (error "No %s version of %S" face ofont)))))
+ (error "No bold version of %S" font)))))
(defun make-face-italic (face &optional frame noerror)
"Make the font of the given face be italic, if possible.
(face-font 'default frame)
(cdr (assq 'font (frame-parameters frame)))))
(or (and (setq f2 (x-make-font-italic font))
- (internal-try-face-font face f2))
+ (internal-try-face-font face f2 frame))
(and (setq f2 (x-make-font-oblique font))
- (internal-try-face-font face f2))))
+ (internal-try-face-font face f2 frame))))
(or (not (equal ofont (face-font face)))
(and (not noerror)
- (error "No %s version of %S" face ofont)))))
+ (error "No italic version of %S" font)))))
(defun make-face-bold-italic (face &optional frame noerror)
"Make the font of the given face be bold and italic, if possible.
(not (equal font f2))
(setq f3 (x-make-font-bold f2))
(not (equal f2 f3))
- (internal-try-face-font face f3))
+ (internal-try-face-font face f3 frame))
(and (setq f2 (x-make-font-oblique font))
(not (equal font f2))
(setq f3 (x-make-font-bold f2))
(not (equal f2 f3))
- (internal-try-face-font face f3))
+ (internal-try-face-font face f3 frame))
(and (setq f2 (x-make-font-italic font))
(not (equal font f2))
(setq f3 (x-make-font-demibold f2))
(not (equal f2 f3))
- (internal-try-face-font face f3))
+ (internal-try-face-font face f3 frame))
(and (setq f2 (x-make-font-oblique font))
(not (equal font f2))
(setq f3 (x-make-font-demibold f2))
(not (equal f2 f3))
- (internal-try-face-font face f3))))
+ (internal-try-face-font face f3 frame))))
(or (not (equal ofont (face-font face)))
(and (not noerror)
- (error "No %s version of %S" face ofont)))))
+ (error "No bold italic version of %S" font)))))
(defun make-face-unbold (face &optional frame noerror)
"Make the font of the given face be non-bold, if possible.
(face-font 'default frame)
(cdr (assq 'font (frame-parameters frame)))))
(setq font (x-make-font-unbold font1))
- (if font (internal-try-face-font face font)))
+ (if font (internal-try-face-font face font frame)))
(or (not (equal ofont (face-font face)))
(and (not noerror)
- (error "No %s version of %S" face ofont)))))
+ (error "No unbold version of %S" font1)))))
(defun make-face-unitalic (face &optional frame noerror)
"Make the font of the given face be non-italic, if possible.
(face-font 'default frame)
(cdr (assq 'font (frame-parameters frame)))))
(setq font (x-make-font-unitalic font1))
- (if font (internal-try-face-font face font)))
+ (if font (internal-try-face-font face font frame)))
(or (not (equal ofont (face-font face)))
(and (not noerror)
- (error "No %s version of %S" face ofont)))))
+ (error "No unitalic version of %S" font1)))))
\f
-;;; Make the builtin faces; the C code knows these as faces 0, 1, and 2,
-;;; respectively, so they must be the first three faces made.
-
+;;; Make the default and modeline faces; the C code knows these as
+;;; faces 0 and 1, respectively, so they must be the first two faces
+;;; made.
(defun face-initialize ()
(make-face 'default)
(make-face 'modeline)
(set-frame-face-alist frame faces)
(if (cdr (or (assq 'reverse parameters)
- (assq 'reverse default-frame-alist)))
+ (assq 'reverse default-frame-alist)
+ (cons nil
+ (x-get-resource "reverseVideo" "ReverseVideo"))))
(let ((params (frame-parameters frame)))
(modify-frame-parameters
frame