From d4c6530fc5e434228fc310b36483c04c94c8a745 Mon Sep 17 00:00:00 2001
From: Juri Linkov <juri@jurta.org>
Date: Sun, 11 Dec 2005 11:09:33 +0000
Subject: [PATCH] (frame-background-mode): Replace `choice-item' keywords with
 `const' to not make [default] button.  Change default value tag from
 `default' to `automatic'.  Doc fix. (trailing-whitespace) <defface>: Change
 group `whitespace' to `whitespace-faces'.

---
 lisp/ChangeLog | 17 +++++++++++++++++
 lisp/faces.el  | 14 +++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 06ec64917ab..9fe14112305 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2005-12-11  Juri Linkov  <juri@jurta.org>
+
+	* frame.el (set-background-color, set-foreground-color)
+	(set-cursor-color, set-mouse-color, set-border-color):
+	Add explicit prompts to read colors by `facemenu-read-color'.
+	(show-trailing-whitespace, blink-cursor-delay)
+	(blink-cursor-interval, display-hourglass, hourglass-delay):
+	Remove tags.
+	(display-hourglass, hourglass-delay): Doc fix.
+	(cursor-in-non-selected-windows): Capitalize words in tag.
+
+	* faces.el (frame-background-mode): Replace `choice-item' keywords
+	with `const' to not make [default] button.  Change default value tag
+	from `default' to `automatic'.  Doc fix.
+	(trailing-whitespace) <defface>: Change group `whitespace' to
+	`whitespace-faces'.
+
 2005-12-11  Richard M. Stallman  <rms@gnu.org>
 
 	* buff-menu.el (Buffer-menu-sort-column): Not a user variable.
diff --git a/lisp/faces.el b/lisp/faces.el
index acb91ad1ed1..013ca673e19 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1577,17 +1577,17 @@ If omitted or nil, that stands for the selected frame's display."
 (defcustom frame-background-mode nil
   "*The brightness of the background.
 Set this to the symbol `dark' if your background color is dark,
-`light' if your background is light, or nil (default) if you want Emacs
-to examine the brightness for you.  Don't set this variable with `setq';
-this won't have the expected effect."
+`light' if your background is light, or nil (automatic by default)
+if you want Emacs to examine the brightness for you.  Don't set this
+variable with `setq'; this won't have the expected effect."
   :group 'faces
   :set #'(lambda (var value)
 	   (set-default var value)
 	   (mapc 'frame-set-background-mode (frame-list)))
   :initialize 'custom-initialize-changed
-  :type '(choice (choice-item dark)
-		 (choice-item light)
-		 (choice-item :tag "default" nil)))
+  :type '(choice (const dark)
+		 (const light)
+		 (const :tag "automatic" nil)))
 
 (defvar default-frame-background-mode nil
   "Internal variable for the default brightness of the background.
@@ -1983,7 +1983,7 @@ created."
     (t :inverse-video t))
   "Basic face for highlighting trailing whitespace."
   :version "21.1"
-  :group 'whitespace		; like `show-trailing-whitespace'
+  :group 'whitespace-faces	; like `show-trailing-whitespace'
   :group 'basic-faces)
 
 (defface escape-glyph
-- 
2.11.4.GIT