Merged from miles@gnu.org--gnu-2005 (patch 80-82, 350-422)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-350
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-351
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-352
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-353
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-354
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-355
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-356
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-357
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-358
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-359
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-360
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-361
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-362
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-363
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-364
   Remove "-face" suffix from widget faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-365
   Remove "-face" suffix from custom faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
   Remove "-face" suffix from change-log faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-367
   Remove "-face" suffix from compilation faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
   Remove "-face" suffix from diff-mode faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-369
   lisp/longlines.el (longlines-visible-face): Face removed

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-370
   Remove "-face" suffix from woman faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-371
   Remove "-face" suffix from whitespace-highlight face

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-372
   Remove "-face" suffix from ruler-mode faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-373
   Remove "-face" suffix from show-paren faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374
   Remove "-face" suffix from log-view faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
   Remove "-face" suffix from smerge faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-376
   Remove "-face" suffix from show-tabs faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-377
   Remove "-face" suffix from highlight-changes faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-378
   Remove "-face" suffix from and downcase info faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-379
   Remove "-face" suffix from pcvs faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-380
   Update uses of renamed pcvs faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-381
   Tweak ChangeLog

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-382
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-383
   Remove "-face" suffix from strokes-char face

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-384
   Remove "-face" suffix from compare-windows face

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-385
   Remove "-face" suffix from calendar faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-386
   Remove "-face" suffix from diary-button face

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-387
   Remove "-face" suffix from testcover faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-388
   Remove "-face" suffix from viper faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-389
   Remove "-face" suffix from org faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-390
   Remove "-face" suffix from sgml-namespace face

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-391
   Remove "-face" suffix from table-cell face

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-392
   Remove "-face" suffix from tex-mode faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-393
   Remove "-face" suffix from texinfo-heading face

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-394
   Remove "-face" suffix from flyspell faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-395
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-396
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-397
   Remove "-face" suffix from gomoku faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-398
   Remove "-face" suffix from mpuz faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-399
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-400
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-401
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-402
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-403
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-404
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-405
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-406
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-407
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-408
   Remove "-face" suffix from Buffer-menu-buffer face

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-409
   Remove "-face" suffix from antlr-mode faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-410
   Remove "-face" suffix from ebrowse faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-411
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-412
   Remove "-face" suffix from flymake faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-413
   Remove "-face" suffix from idlwave faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-414
   Remove "-face" suffix from sh-script faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-415
   Remove "-face" suffix from vhdl-mode faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-416
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-417
   Remove "-face" suffix from which-func face

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-418
   Remove "-face" suffix from cperl-mode faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-419
   Remove "-face" suffix from ld-script faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-420
   Fix cperl-mode font-lock problem

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-421
   Tweak which-func face

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-422
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-80
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-81
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-82
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-350

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)
 DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p,
        Sinternal_lisp_face_equal_p, 2, 3, 0,
        doc: /* True if FACE1 and FACE2 are equal.
-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 the optional argument FRAME is given, report on FACE1 and FACE2 in that frame.
+If FRAME is t, report on the defaults for FACE1 and FACE2 (for new frames).
 If FRAME is omitted or nil, use the selected frame.  */)
      (face1, face2, frame)
      Lisp_Object face1, face2, frame;
@@ -5058,8 +5058,8 @@ If FRAME is omitted or nil, use the selected frame.  */)
        Emacs.  That frame is not an X frame.  */
     f = frame_or_selected_frame (frame, 2);
 
-  lface1 = lface_from_face_name (NULL, face1, 1);
-  lface2 = lface_from_face_name (NULL, face2, 1);
+  lface1 = lface_from_face_name (f, face1, 1);
+  lface2 = lface_from_face_name (f, face2, 1);
   equal_p = lface_equal_p (XVECTOR (lface1)->contents,
                            XVECTOR (lface2)->contents);
   return equal_p ? Qt : Qnil;
@@ -6126,7 +6126,7 @@ DEFUN ("display-supports-face-attributes-p",
        1, 2, 0,
        doc: /* Return non-nil if all the face attributes in ATTRIBUTES are supported.
 The optional argument DISPLAY can be a display name, a frame, or
-nil (meaning the selected frame's display)
+nil (meaning the selected frame's display).
 
 The definition of `supported' is somewhat heuristic, but basically means
 that 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
 any display that can display bold, and a `:foreground \"yellow\"' as long
 as it can display a yellowish color, but `:slant italic' will _not_ be
 satisfied by the tty display code's automatic substitution of a `dim'
-face for italic. */)
+face for italic.  */)
   (attributes, display)
      Lisp_Object attributes, display;
 {