Merged in changes from CVS trunk. (Long time no see!) :-)

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84
   Update from CVS

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-22
   <no summary provided>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-40
   Fix regressions from latest reftex update

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

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-54
   Update from CVS: lisp/cus-start.el (all): Add `undo-outer-limit'.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-72
   src/dispextern.h (xassert): Enable unconditionally.

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--base-0
   tag of miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2
   Merge from miles@gnu.org--gnu-2004

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-5
   Update from CVS: exi/gnus-faq.texi ([4.1]): Typo.

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

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

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

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

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

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


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

1 files changed, 3 insertions, 2 deletions

diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 0bd3387d3c7..1a8cce0473a 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -53,6 +53,7 @@
 	      (make-face-x-resource-internal face)))))
     ;; Don't record SPEC until we see it causes no errors.
     (put face 'face-defface-spec spec)
+    (push (cons 'defface face) current-load-list)
     (when (and doc (null (face-documentation face)))
       (set-face-documentation face (purecopy doc)))
     (custom-handle-all-keywords face args 'custom-face)
@@ -198,11 +199,11 @@
 
     (:foreground
      (color :tag "Foreground"
-	    :help-echo "Set foreground color."))
+	    :help-echo "Set foreground color (name or #RRGGBB hex spec)."))
 
     (:background
      (color :tag "Background"
-	    :help-echo "Set background color."))
+	    :help-echo "Set background color (name or #RRGGBB hex spec)."))
 
     (:stipple
      (choice :tag "Stipple"