* lisp/faces.el (cursor): Doc fix.

Also, remove the :foreground attributes from cursor faces
in built-in themes, since that attribute is unmeaningful.

diff --git a/etc/themes/deeper-blue-theme.el b/etc/themes/deeper-blue-theme.el
index 5c93e84d0786f4bbf9f95a2be31eca50ecf667a5..0fbd9496969db6be342d5c3ec56a3421f5df7425 100644 (file)
--- a/etc/themes/deeper-blue-theme.el
+++ b/etc/themes/deeper-blue-theme.el
@@ -37,7 +37,7 @@
    `(compilation-line-number ((,class (:foreground "LightGreen"))))
    `(cperl-array-face ((,class (:foreground "yellow2"))))
    `(cperl-hash-face ((,class (:foreground "coral1"))))
-   `(cursor ((,class (:background "green" :foreground "black"))))
+   `(cursor ((,class (:background "green"))))
    `(default ((,class (:background "#181a26" :foreground "gray80"))))
    `(diff-added ((,class (nil))))
    `(diff-changed ((,class (nil))))

diff --git a/etc/themes/dichromacy-theme.el b/etc/themes/dichromacy-theme.el
index 3c260118b260422e7ca58147e29fb079143d07a5..80215e564f50e625cab898612ae75afcd306e9f2 100644 (file)
--- a/etc/themes/dichromacy-theme.el
+++ b/etc/themes/dichromacy-theme.el
@@ -42,7 +42,7 @@ Ansi-Color faces are included.")
   (custom-theme-set-faces
    'dichromacy
    `(default ((,class (:foreground "black" :background "white"))))
-   `(cursor ((,class (:foreground "white" :background "black"))))
+   `(cursor ((,class (:background "black"))))
    ;; Highlighting faces
    `(fringe ((,class (:background "#f7f7f7"))))
    `(highlight ((,class (:foreground ,blue :background "#e5e5e5"))))

diff --git a/etc/themes/misterioso-theme.el b/etc/themes/misterioso-theme.el
index ab4b2bc6191a53d0418b0eed1f4818c3ada4106c..6e38a43a4f0c0a6c8d9dc6d745fe333c018680a6 100644 (file)
--- a/etc/themes/misterioso-theme.el
+++ b/etc/themes/misterioso-theme.el
@@ -33,7 +33,7 @@
               (:background "#2d3743" :foreground "#e1e1e0"))
              (,class
               (:background "#3a3a3a" :foreground "#e1e1e0"))))
-   `(cursor ((,class (:background "#415160" :foreground "#415160"))))
+   `(cursor ((,class (:background "#415160"))))
    ;; Highlighting faces
    `(fringe ((,class (:background "#2e3748"))))
    `(highlight ((,class (:background "#338f86" :foreground "#e1e1e0"))))

diff --git a/etc/themes/tango-dark-theme.el b/etc/themes/tango-dark-theme.el
index 8f91d35e6a107ada151b489acadf81b4651273b3..ae45966b347ca9897e96e9e720de15be87d00527 100644 (file)
--- a/etc/themes/tango-dark-theme.el
+++ b/etc/themes/tango-dark-theme.el
@@ -56,7 +56,7 @@ Semantic, and Ansi-Color faces are included.")
               (:foreground ,alum-1 :background "#222"))
              (,class
               (:foreground ,alum-1 :background "black"))))
-   `(cursor ((,class (:foreground ,alum-6 :background ,butter-1))))
+   `(cursor ((,class (:background ,butter-1))))
    ;; Highlighting faces
    `(fringe ((,class (:background ,alum-7))))
    `(highlight ((,class (:foreground ,alum-6 :background ,butter-2))))

diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el
index f504d764277116ead35d961ea2b5c57335d25e92..b46bd677f217fa08e26752242a64fda3329a1599 100644 (file)
--- a/etc/themes/tango-theme.el
+++ b/etc/themes/tango-theme.el
@@ -49,7 +49,7 @@ Semantic, and Ansi-Color faces are included.")
   (custom-theme-set-faces
    'tango
    `(default ((,class (:foreground ,alum-6 :background ,alum-1))))
-   `(cursor ((,class (:foreground ,alum-1 :background ,blue-3))))
+   `(cursor ((,class (:background ,blue-3))))
    ;; Highlighting faces
    `(fringe ((,class (:background ,alum-2))))
    `(highlight ((,class (:background ,alum-3))))

diff --git a/etc/themes/wheatgrass-theme.el b/etc/themes/wheatgrass-theme.el
index 63ebc247b9db83590a5a700b0a1476dae260ce6e..50db2661a99122054ca45b26ea215894c4e1d03a 100644 (file)
--- a/etc/themes/wheatgrass-theme.el
+++ b/etc/themes/wheatgrass-theme.el
@@ -29,7 +29,7 @@ of green, brown, and blue.")
   (custom-theme-set-faces
    'wheatgrass
    `(default ((,class (:foreground "wheat" :background "black"))))
-   `(cursor ((,class (:foreground "black" :background "thistle"))))
+   `(cursor ((,class (:background "thistle"))))
    `(error ((,class (:foreground "salmon1"))))
    `(warning ((,class (:foreground "orange"))))
    `(success ((,class (:foreground "yellow green"))))

diff --git a/etc/themes/whiteboard-theme.el b/etc/themes/whiteboard-theme.el
index e0fa7ff7ff785679b12b17d4efc6a0e840ced089..e5c808df68da2f5bf2a8b289453d921d7b2753b0 100644 (file)
--- a/etc/themes/whiteboard-theme.el
+++ b/etc/themes/whiteboard-theme.el
@@ -38,7 +38,7 @@
    `(cperl-array-face ((,class (:foreground "SlateBlue3"))))
    `(cperl-hash-face ((,class (:foreground "turquoise3"))))
    `(cperl-nonoverridable-face ((,class (:foreground "orchid3"))))
-   `(cursor ((,class (:background "Green4" :foreground "gainsboro"))))
+   `(cursor ((,class (:background "Green4"))))
    `(default ((,class (:background "whitesmoke" :foreground "black"))))
    `(dired-marked ((,class (:background "dodgerblue3" :foreground "white"))))
    `(flymake-errline ((,class (:background nil :underline "red"))))

diff --git a/etc/themes/wombat-theme.el b/etc/themes/wombat-theme.el
index 2aa64f894bfbb042fe0292a6f06364364994b8e1..6691b4a4016fae7974572f0d9998b9a5535b63e8 100644 (file)
--- a/etc/themes/wombat-theme.el
+++ b/etc/themes/wombat-theme.el
@@ -31,7 +31,7 @@ are included.")
   (custom-theme-set-faces
    'wombat
    `(default ((,class (:background "#242424" :foreground "#f6f3e8"))))
-   `(cursor ((,class (:background "#656565" :foreground "#f6f3e8"))))
+   `(cursor ((,class (:background "#656565"))))
    ;; Highlighting faces
    `(fringe ((,class (:background "#303030"))))
    `(highlight ((,class (:background "#454545" :foreground "#ffffff"

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c3024db88215a1ce7b944fa3545e46a7f457e061..21f52e8ca03e51d626f4255de80dbde63fbb347f 100644 (file)
--- 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 d5f0ef90ee019eef19100dc80f7189da1c1dca2b..45173eb35dae8140462238e6f38d8d993f97db41 100644 (file)
--- 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