aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2005-06-03 10:39:29 +0000
committerJuanma Barranquero2005-06-03 10:39:29 +0000
commit03f1132278dce5f86456f58418f608d6d0aa6e14 (patch)
tree3ebb7b8de1b7ef86f4be0fa859c718a5993511d7 /src
parenta09be93a894d713ade1c114c4d380c317992295e (diff)
downloademacs-03f1132278dce5f86456f58418f608d6d0aa6e14.tar.gz
emacs-03f1132278dce5f86456f58418f608d6d0aa6e14.zip
(Finternal_lisp_face_equal_p): Really report on faces in a frame, if the
argument FRAME is non-nil. Improve argument/docstring consistency.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 21bdb88c860..606a854980a 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5022,8 +5022,8 @@ lface_equal_p (v1, v2)
5022DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p, 5022DEFUN ("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.
5025If the optional argument FRAME is given, report on face FACE in that frame. 5025If the optional argument FRAME is given, report on FACE1 and FACE2 in that frame.
5026If FRAME is t, report on the defaults for face FACE (for new frames). 5026If FRAME is t, report on the defaults for FACE1 and FACE2 (for new frames).
5027If FRAME is omitted or nil, use the selected frame. */) 5027If 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;
@@ -5041,8 +5041,8 @@ If FRAME is omitted or nil, use the selected frame. */)
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;