tries to find a font with a suitable slant, even if this results in
a font height that isn't optimal."
:tag "Font selection order."
+ :type '(list symbol symbol symbol symbol)
:group 'font-selection
:set #'(lambda (symbol value)
(set-default symbol value)
(internal-set-font-selection-order value)))
-
+;; This is defined originally in {w32,x}faces.c.
(defcustom face-font-family-alternatives
'(("courier" "fixed")
("helv" "helvetica" "arial" "fixed"))
If fonts of family FAMILY can't be loaded, try ALTERNATIVE1, then
ALTERNATIVE2 etc."
:tag "Alternative font families to try."
+ :type '(repeat (repeat string))
:group 'font-selection
:set #'(lambda (symbol value)
(set-default symbol value)
;; The functions in this section are defined because Lisp packages use
;; them, despite the prefix `internal-' suggesting that they are
-;; private to the face implementation.
+;; private to the face implementation.
(defun internal-find-face (name &optional frame)
"Retrieve the face named NAME.
This function is defined for compatibility with Emacs 20.2. It
should not be used anymore."
(facep name))
+(make-obsolete 'internal-find-face 'facep "21.1")
(defun internal-get-face (name &optional frame)
should not be used anymore."
(or (internal-find-face name frame)
(check-face name)))
-
+(make-obsolete 'internal-get-face "See `facep' and `check-face'." "21.1")
\f
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(:stipple
(".attributeStipple" . "Face.AttributeStipple")
(".attributeBackgroundPixmap" . "Face.AttributeBackgroundPixmap"))
- (:font (".attributeFont" . "Face.AttributeFont"))
(:bold (".attributeBold" . "Face.AttributeBold"))
(:italic (".attributeItalic" . "Face.AttributeItalic"))
(:font (".attributeFont" . "Face.AttributeFont")))
`:inverse-video'
VALUE specifies whether characters in FACE should be displayed in
-inverse video. VALUE must be one of t or nil.
+inverse video. VALUE must be one of t or nil.
`:stipple'
(defun make-face-unitalic (face &optional frame noerror)
"Make the font of FACE be non-italic, if possible.
-FRAME nil or not specified means change face on all frames."
+FRAME nil or not specified means change face on all frames.
+Argument NOERROR is ignored and retained for compatibility."
(interactive (list (read-face-name "Make which face non-italic ")))
(set-face-attribute face frame :slant 'normal))
(defun set-face-stipple (face stipple &optional frame)
"Change the stipple pixmap of face FACE to STIPPLE.
FRAME nil or not specified means change face on all frames.
-STIPPLE. should be a string, the name of a file of pixmap data.
+STIPPLE 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, STIPPLE may be a list of the form (WIDTH HEIGHT DATA)
"Read the name of a font for FACE on FRAME.
If optional argument FRAME Is nil or omitted, use the selected frame."
(let ((completion-ignore-case t))
- (completing-read "Set font attributes of face %s from font: "
- face (x-list-fonts "*" nil frame))))
+ (completing-read (format "Set font attributes of face %s from font: " face)
+ (mapcar 'list (x-list-fonts "*" nil frame)))))
(defun read-all-face-attributes (face &optional frame)
(save-excursion
(save-match-data
(search-backward face-name)
- (help-xref-button 0 #'customize-face face-name)))
+ (help-xref-button 0 (lambda (f)
+ (if help-xref-stack
+ (pop help-xref-stack))
+ (customize-face f))
+ face-name
+ "mouse-2: customize this face")))
(let ((beg (point)))
(insert list-faces-sample-text)
;; Hyperlink to a help buffer for the face.
(save-excursion
(save-match-data
(search-backward list-faces-sample-text)
- (help-xref-button 0 #'describe-face face)))
+ (help-xref-button 0 #'describe-face face
+ "mouse-2: describe this face")))
(insert "\n")
(put-text-property beg (1- (point)) 'face face)
;; If the sample text has multiple lines, line up all of them.
If the optional argument FRAME is given, report on face FACE in that frame.
If FRAME is t, report on the defaults for face FACE (for new frames).
If FRAME is omitted or nil, use the selected frame."
- (interactive (list (read-face-name "Describe face ")))
+ (interactive (list (read-face-name "Describe face")))
(let* ((attrs '((:family . "Family")
(:width . "Width")
(:height . "Height")
(:strike-through . "Strike-through")
(:box . "Box")
(:inverse-video . "Inverse")
- (:stipple . "Stipple")))
+ (:stipple . "Stipple")
+ (:font . "Font or fontset")))
(max-width (apply #'max (mapcar #'(lambda (x) (length (cdr x)))
attrs))))
(with-output-to-temp-buffer "*Help*"
(cdr a) ": " (format "%s" attr) "\n")))
(insert "\nDocumentation:\n\n"
(or (face-documentation face)
- "not documented as a face.")))
- (print-help-return-message))))
-
-
-
+ "not documented as a face."))
+ (let ((customize-label "customize"))
+ (terpri)
+ (terpri)
+ (princ (concat "You can " customize-label " this face."))
+ (with-current-buffer "*Help*"
+ (save-excursion
+ (re-search-backward
+ (concat "\\(" customize-label "\\)") nil t)
+ (help-xref-button 1 #'customize-face face
+ "mouse-2, RET: customize face")))))
+ (print-help-return-message)
+ (with-current-buffer "*Help*"
+ (help-setup-xref (list #'describe-face face) (interactive-p))
+ (buffer-string)))))
\f
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Face specifications (defface).
((eq req 'background)
(memq (frame-parameter frame 'background-mode)
options))
- (t (error "Unknown req `%S' with options `%S'"
+ (t (error "Unknown req `%S' with options `%S'"
req options)))))
match))
;; Support some old-style attribute names and values.
(case attribute
(:bold (setq attribute :weight value (if value 'bold 'normal)))
- (:italic (setq attribute :slant value (if value 'italic 'normal))))
- (setq params (cons attribute (cons value params))))
+ (:italic (setq attribute :slant value (if value 'italic 'normal)))
+ (t (unless (assq attribute face-x-resources)
+ (setq attribute nil))))
+ (when attribute
+ (setq params (cons attribute (cons value params)))))
(setq attrs (cdr (cdr attrs))))
(face-spec-reset-face face frame)
(apply #'set-face-attribute face frame params)))
"*The brightness of the background.
Set this to the symbol `dark' if your background color is dark, `light' if
your background is light, or nil (default) if you want Emacs to
-examine the brightness for you."
+examine the brightness for you. Don't set this variable with `setq';
+this won't have the expected effect."
:group 'faces
:set #'(lambda (var value)
- (set var value)
+ (set-default var value)
(mapcar 'frame-set-background-mode (frame-list)))
:initialize 'custom-initialize-changed
- :type '(choice (choice-item dark)
+ :type '(choice (choice-item dark)
(choice-item light)
(choice-item :tag "default" nil)))
;; Update a frame's faces when we change its default font.
-(defun frame-update-faces (frame)
- nil)
-
+(defalias 'frame-update-faces 'ignore)
+(make-obsolete 'frame-update-faces "No longer necessary" "21.1")
;; Update the colors of FACE, after FRAME's own colors have been
;; changed.
-(defun frame-update-face-colors (frame)
- (frame-set-background-mode frame))
-
+(defalias 'frame-update-face-colors 'frame-set-background-mode)
+(make-obsolete 'frame-update-face-colors 'frame-set-background-mode "21.1")
\f
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defface mode-line
'((((type x) (class color))
- (:box (:line-width 2 :style released-button) :background "grey75"))
+ (:box (:line-width 2 :style released-button)
+ :background "grey75" :foreground "black"))
(((type w32) (class color))
- (:box (:line-width 2 :style released-button) :background "grey75"))
+ (:box (:line-width 2 :style released-button)
+ :background "grey75" :foreground "black"))
(t
(:inverse-video t)))
"Basic mode line face."
(defface header-line
'((((type x) (class color))
- (:box (:line-width 2 :style released-button) :background "grey75"))
+ (:box (:line-width 2 :style released-button)
+ :background "grey75" :foreground "black"))
(((type w32) (class color))
- (:box (:line-width 2 :style released-button) :background "grey75"))
+ (:box (:line-width 2 :style released-button)
+ :background "grey75" :foreground "black"))
(t
(:inverse-video t)))
"Basic header-line face."
(defface tool-bar
'((((type x) (class color))
- (:box (:line-width 1 :style released-button) :background "grey75"))
+ (:box (:line-width 1 :style released-button)
+ :background "grey75" :foreground "black"))
(((type x) (class mono))
- (:box (:line-width 1 :style released-button) :background "grey"))
+ (:box (:line-width 1 :style released-button)
+ :background "grey" :foreground "black"))
(((type w32) (class color))
- (:box (:line-width 1 :style released-button) :background "grey75"))
+ (:box (:line-width 1 :style released-button)
+ :background "grey75" :foreground "black"))
(t
()))
"Basic tool-bar face."
(((class color) (background dark))
(:background "blue"))
(((class color) (background light))
- (:background "lightblue"))
+ (:background "light goldenrod yellow"))
(t (:background "gray")))
"Basic face for highlighting the region."
:group 'basic-faces)
(defface fringe
- '((((class color))
- (:background "grey95"))
- (t
- (:background "gray")))
+ '((((class color) (background light))
+ (:background "grey95"))
+ (((class color) (background dark))
+ (:background "grey10"))
+ (t
+ (:background "gray")))
"Basic face for the fringes to the left and right of windows under X."
:version "21.1"
:group 'frames
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; This is here for compatibilty with Emacs 20.2. For example,
-;; international/fontset.el uses these functions to manipulate font
-;; names. The following functions are not used in the face
-;; implementation itself.
+;; international/fontset.el uses x-resolve-font-name. The following
+;; functions are not used in the face implementation itself.
(defvar x-font-regexp nil)
(defvar x-font-regexp-head nil)
"\\([-*?]\\|\\'\\)"))
(setq x-font-regexp-slant (concat - slant -))
(setq x-font-regexp-weight (concat - weight -))
- nil)
+ nil)
(defun x-resolve-font-name (pattern &optional face frame)
"Return a font name matching PATTERN.
-All wildcards in PATTERN become substantiated.
+All wildcards in PATTERN are instantiated.
If PATTERN is nil, return the name of the frame's base font, which never
contains wildcards.
Given optional arguments FACE and FRAME, return a font which is
((string-match x-font-regexp-weight font)
(concat (substring font 0 (match-beginning 1)) which
(substring font (match-end 1)))))))
-
+(make-obsolete 'x-frob-font-weight 'make-face-... "21.1")
(defun x-frob-font-slant (font which)
(let ((case-fold-search t))
((string-match x-font-regexp-slant font)
(concat (substring font 0 (match-beginning 1)) which
(substring font (match-end 1)))))))
-
+(make-obsolete 'x-frob-font-slant 'make-face-... "21.1")
(defun x-make-font-bold (font)
"Given an X font specification, make a bold version of it.
If that can't be done, return nil."
(x-frob-font-weight font "bold"))
-
+(make-obsolete 'x-make-font-bold 'make-face-bold "21.1")
(defun x-make-font-demibold (font)
"Given an X font specification, make a demibold version of it.
If that can't be done, return nil."
(x-frob-font-weight font "demibold"))
-
+(make-obsolete 'x-make-font-demibold 'make-face-bold "21.1")
(defun x-make-font-unbold (font)
"Given an X font specification, make a non-bold version of it.
If that can't be done, return nil."
(x-frob-font-weight font "medium"))
-
+(make-obsolete 'x-make-font-unbold 'make-face-unbold "21.1")
(defun x-make-font-italic (font)
"Given an X font specification, make an italic version of it.
If that can't be done, return nil."
(x-frob-font-slant font "i"))
-
+(make-obsolete 'x-make-font-italic 'make-face-italic "21.1")
(defun x-make-font-oblique (font) ; you say tomayto...
"Given an X font specification, make an oblique version of it.
If that can't be done, return nil."
(x-frob-font-slant font "o"))
-
+(make-obsolete 'x-make-font-oblique 'make-face-italic "21.1")
(defun x-make-font-unitalic (font)
"Given an X font specification, make a non-italic version of it.
If that can't be done, return nil."
(x-frob-font-slant font "r"))
-
+(make-obsolete 'x-make-font-unitalic 'make-face-unitalic "21.1")
(defun x-make-font-bold-italic (font)
"Given an X font specification, make a bold and italic version of it.
If that can't be done, return nil."
(and (setq font (x-make-font-bold font))
(x-make-font-italic font)))
-
+(make-obsolete 'x-make-font-bold-italic 'make-face-bold-italic "21.1")
(provide 'faces)
-;;; end of faces.el
+;;; faces.el ends here