Mercurial > emacs
comparison src/xfaces.c @ 62969:24f25f7c89cd
(Finternal_lisp_face_equal_p): Really report on faces in a frame, if the
argument FRAME is non-nil. Improve argument/docstring consistency.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Fri, 03 Jun 2005 10:39:29 +0000 |
parents | 179873645b73 |
children | c4a3a3afa8ce 01137c1fdbe9 |
comparison
equal
deleted
inserted
replaced
62968:88922a349851 | 62969:24f25f7c89cd |
---|---|
5020 | 5020 |
5021 | 5021 |
5022 DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p, | 5022 DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p, |
5023 Sinternal_lisp_face_equal_p, 2, 3, 0, | 5023 Sinternal_lisp_face_equal_p, 2, 3, 0, |
5024 doc: /* True if FACE1 and FACE2 are equal. | 5024 doc: /* True if FACE1 and FACE2 are equal. |
5025 If the optional argument FRAME is given, report on face FACE in that frame. | 5025 If the optional argument FRAME is given, report on FACE1 and FACE2 in that frame. |
5026 If FRAME is t, report on the defaults for face FACE (for new frames). | 5026 If FRAME is t, report on the defaults for FACE1 and FACE2 (for new frames). |
5027 If FRAME is omitted or nil, use the selected frame. */) | 5027 If FRAME is omitted or nil, use the selected frame. */) |
5028 (face1, face2, frame) | 5028 (face1, face2, frame) |
5029 Lisp_Object face1, face2, frame; | 5029 Lisp_Object face1, face2, frame; |
5030 { | 5030 { |
5031 int equal_p; | 5031 int equal_p; |
5039 before X frames exist. At that time, if FRAME is nil, | 5039 before X frames exist. At that time, if FRAME is nil, |
5040 selected_frame will be used which is the frame dumped with | 5040 selected_frame will be used which is the frame dumped with |
5041 Emacs. That frame is not an X frame. */ | 5041 Emacs. That frame is not an X frame. */ |
5042 f = frame_or_selected_frame (frame, 2); | 5042 f = frame_or_selected_frame (frame, 2); |
5043 | 5043 |
5044 lface1 = lface_from_face_name (NULL, face1, 1); | 5044 lface1 = lface_from_face_name (f, face1, 1); |
5045 lface2 = lface_from_face_name (NULL, face2, 1); | 5045 lface2 = lface_from_face_name (f, face2, 1); |
5046 equal_p = lface_equal_p (XVECTOR (lface1)->contents, | 5046 equal_p = lface_equal_p (XVECTOR (lface1)->contents, |
5047 XVECTOR (lface2)->contents); | 5047 XVECTOR (lface2)->contents); |
5048 return equal_p ? Qt : Qnil; | 5048 return equal_p ? Qt : Qnil; |
5049 } | 5049 } |
5050 | 5050 |