# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1282892840 0
# Node ID a256d36d62574832795c3d266aca3a89bbf1bc85
# Parent  6c405a2a9f8ebffb8a4a0d2a88c437916fdd6fe7# Parent  5eae6917d2e02129cfed859aaecb76cebe84a690
Merge from mainline.

diff -r 6c405a2a9f8e -r a256d36d6257 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Aug 27 01:53:01 2010 +0000
+++ b/lisp/ChangeLog	Fri Aug 27 07:07:20 2010 +0000
@@ -1,3 +1,7 @@
+2010-08-27  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+	* whitespace.el (whitespace-style): Adjust type declaration.
+
 2010-08-26  Nathan Weizenbaum  <nweiz@cressida.sea.corp.google.com>  (tiny change)
 
 	* progmodes/js.el: Make indentation more customizable (Bug#6914).
diff -r 6c405a2a9f8e -r a256d36d6257 lisp/whitespace.el
--- a/lisp/whitespace.el	Fri Aug 27 01:53:01 2010 +0000
+++ b/lisp/whitespace.el	Fri Aug 27 07:07:20 2010 +0000
@@ -529,6 +529,8 @@
 See also `whitespace-display-mappings' for documentation."
   :type '(repeat :tag "Kind of Blank"
 		 (choice :tag "Kind of Blank Face"
+			 (const :tag "(Face) Face visualization"
+				face)
 			 (const :tag "(Face) Trailing TABs, SPACEs and HARD SPACEs"
 				trailing)
 			 (const :tag "(Face) SPACEs and HARD SPACEs"