aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong2011-10-18 02:17:05 -0400
committerChong Yidong2011-10-18 02:17:05 -0400
commit08b0fee82afa6153e14179b60e8315219782507a (patch)
treec88cc226cc759f40e70b5aaf09d76afcd8101108 /lisp
parent743d0817bcb3df7e3d86d414fd29b1553695f9f5 (diff)
downloademacs-08b0fee82afa6153e14179b60e8315219782507a.tar.gz
emacs-08b0fee82afa6153e14179b60e8315219782507a.zip
* lisp/faces.el (cursor): Doc fix.
Also, remove the :foreground attributes from cursor faces in built-in themes, since that attribute is unmeaningful.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/faces.el4
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 @@
12011-10-18 Chong Yidong <cyd@gnu.org>
2
3 * faces.el (cursor): Doc fix.
4
12011-10-17 Chong Yidong <cyd@gnu.org> 52011-10-17 Chong Yidong <cyd@gnu.org>
2 6
3 * font-lock.el (font-lock-maximum-size): Mark as obsolete. 7 * 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."
2366 '((((background light)) :background "black") 2366 '((((background light)) :background "black")
2367 (((background dark)) :background "white")) 2367 (((background dark)) :background "white"))
2368 "Basic face for the cursor color under X. 2368 "Basic face for the cursor color under X.
2369Currently, only the `:background' attribute is meaningful; all
2370other attributes are ignored. The cursor foreground color is
2371taken from the background color of the underlying text.
2372
2369Note: Other faces cannot inherit from the cursor face." 2373Note: Other faces cannot inherit from the cursor face."
2370 :version "21.1" 2374 :version "21.1"
2371 :group 'cursor 2375 :group 'cursor