aboutsummaryrefslogtreecommitdiffstats
path: root/src/xfaces.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xfaces.c')
-rw-r--r--src/xfaces.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 953276aef83..f55ee7a901f 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5039,8 +5039,8 @@ lface_equal_p (v1, v2)
5039DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p, 5039DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p,
5040 Sinternal_lisp_face_equal_p, 2, 3, 0, 5040 Sinternal_lisp_face_equal_p, 2, 3, 0,
5041 doc: /* True if FACE1 and FACE2 are equal. 5041 doc: /* True if FACE1 and FACE2 are equal.
5042If the optional argument FRAME is given, report on face FACE in that frame. 5042If the optional argument FRAME is given, report on FACE1 and FACE2 in that frame.
5043If FRAME is t, report on the defaults for face FACE (for new frames). 5043If FRAME is t, report on the defaults for FACE1 and FACE2 (for new frames).
5044If FRAME is omitted or nil, use the selected frame. */) 5044If FRAME is omitted or nil, use the selected frame. */)
5045 (face1, face2, frame) 5045 (face1, face2, frame)
5046 Lisp_Object face1, face2, frame; 5046 Lisp_Object face1, face2, frame;
@@ -5058,8 +5058,8 @@ If FRAME is omitted or nil, use the selected frame. */)
5058 Emacs. That frame is not an X frame. */ 5058 Emacs. That frame is not an X frame. */
5059 f = frame_or_selected_frame (frame, 2); 5059 f = frame_or_selected_frame (frame, 2);
5060 5060
5061 lface1 = lface_from_face_name (NULL, face1, 1); 5061 lface1 = lface_from_face_name (f, face1, 1);
5062 lface2 = lface_from_face_name (NULL, face2, 1); 5062 lface2 = lface_from_face_name (f, face2, 1);
5063 equal_p = lface_equal_p (XVECTOR (lface1)->contents, 5063 equal_p = lface_equal_p (XVECTOR (lface1)->contents,
5064 XVECTOR (lface2)->contents); 5064 XVECTOR (lface2)->contents);
5065 return equal_p ? Qt : Qnil; 5065 return equal_p ? Qt : Qnil;
@@ -6126,7 +6126,7 @@ DEFUN ("display-supports-face-attributes-p",
6126 1, 2, 0, 6126 1, 2, 0,
6127 doc: /* Return non-nil if all the face attributes in ATTRIBUTES are supported. 6127 doc: /* Return non-nil if all the face attributes in ATTRIBUTES are supported.
6128The optional argument DISPLAY can be a display name, a frame, or 6128The optional argument DISPLAY can be a display name, a frame, or
6129nil (meaning the selected frame's display) 6129nil (meaning the selected frame's display).
6130 6130
6131The definition of `supported' is somewhat heuristic, but basically means 6131The definition of `supported' is somewhat heuristic, but basically means
6132that a face containing all the attributes in ATTRIBUTES, when merged 6132that a face containing all the attributes in ATTRIBUTES, when merged
@@ -6139,7 +6139,7 @@ Point (2) implies that a `:weight black' attribute will be satisfied by
6139any display that can display bold, and a `:foreground \"yellow\"' as long 6139any display that can display bold, and a `:foreground \"yellow\"' as long
6140as it can display a yellowish color, but `:slant italic' will _not_ be 6140as it can display a yellowish color, but `:slant italic' will _not_ be
6141satisfied by the tty display code's automatic substitution of a `dim' 6141satisfied by the tty display code's automatic substitution of a `dim'
6142face for italic. */) 6142face for italic. */)
6143 (attributes, display) 6143 (attributes, display)
6144 Lisp_Object attributes, display; 6144 Lisp_Object attributes, display;
6145{ 6145{