From 2680c30938c8f553a2d76dfe12313028b08c6dc7 Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@gnu.org>
Date: Sat, 28 Jan 2012 11:21:04 +0800
Subject: [PATCH] * lisp/frame.el (set-cursor-color): Doc fix.

* doc/emacs/display.texi (Faces): Add xref to Colors node.

Fixes: debbugs:352
---
 doc/emacs/ChangeLog    | 4 ++++
 doc/emacs/display.texi | 2 +-
 lisp/ChangeLog         | 2 ++
 lisp/frame.el          | 6 +++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 5c56720a40e..edbd20fe984 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-28  Chong Yidong  <cyd@gnu.org>
+
+	* display.texi (Faces): Add xref to Colors node.
+
 2012-01-27  Dani Moncayo  <dmoncayo@gmail.com>
 
 	* buffers.texi (Select Buffer): Clarify explanation of switching
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 67feb791fe1..6e69b723204 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -493,7 +493,7 @@ attribute is taken from the face named @code{default}.
 
   The @code{default} face is the default for displaying text, and all
 of its attributes are specified.  Its background color is also used as
-the frame's background color.
+the frame's background color.  @xref{Colors}.
 
 @cindex cursor face
   Another special face is the @code{cursor} face.  On graphical
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 29bf8e7a414..c683f94444b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-01-28  Chong Yidong  <cyd@gnu.org>
 
+	* frame.el (set-cursor-color): Doc fix (Bug#352).
+
 	* mail/rmail.el (rmail-start-mail): Add send-action again (Bug#10625).
 	(rmail-mail-return): Switch to NEWBUF only if it is non-nil.
 
diff --git a/lisp/frame.el b/lisp/frame.el
index 842d07abf50..88ae712bab2 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1108,7 +1108,11 @@ To get the frame's current foreground color, use `frame-parameters'."
 (defun set-cursor-color (color-name)
   "Set the text cursor color of the selected frame to COLOR-NAME.
 When called interactively, prompt for the name of the color to use.
-To get the frame's current cursor color, use `frame-parameters'."
+This works by setting the `cursor-color' frame parameter on the
+selected frame.
+
+You can also set the text cursor color, for all frames, by
+customizing the `cursor' face."
   (interactive (list (read-color "Cursor color: ")))
   (modify-frame-parameters (selected-frame)
 			   (list (cons 'cursor-color color-name))))
-- 
2.11.4.GIT