Merged in changes from CVS trunk.

[gnu-emacs] / lisp / faces.el

diff --git a/lisp/faces.el b/lisp/faces.el
index 15e0f2549a882e92cbfaac5b8495fc064d35efbe..d7a088da46cf652d5740546fc89c961830f0c828 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1954,11 +1954,13 @@ created."
 
 
 (defface cursor '()
-  "Basic face for the cursor color under X."
+  "Basic face for the cursor color under X.
+Note: Other faces cannot inherit from the cursor face."
   :version "21.1"
   :group 'cursor
   :group 'basic-faces)
 
+(put 'cursor 'face-no-inherit t)
 
 (defface mouse '()
   "Basic face for the mouse color under X."