2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c3024db8821..21f52e8ca03 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-18  Chong Yidong  <cyd@gnu.org>
+
+        * faces.el (cursor): Doc fix.
+
 2011-10-17  Chong Yidong  <cyd@gnu.org>
 
         * font-lock.el (font-lock-maximum-size): Mark as obsolete.
diff --git a/lisp/faces.el b/lisp/faces.el
index d5f0ef90ee0..45173eb35da 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2366,6 +2366,10 @@ used to display the prompt text."
   '((((background light)) :background "black")
     (((background dark))  :background "white"))
   "Basic face for the cursor color under X.
+Currently, only the `:background' attribute is meaningful; all
+other attributes are ignored.  The cursor foreground color is
+taken from the background color of the underlying text.
+
 Note: Other faces cannot inherit from the cursor face."
   :version "21.1"
   :group 'cursor