# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1263449596 28800
# Node ID f8aafba5ed54bb05e58d0cf98590166c9a762b3a
# Parent  137aaa9655c5150ad2e483a3f3cb3f5a12ea465f
(show-trailing-whitespace): Safe if boolean.  (Bug#5312)

diff -r 137aaa9655c5 -r f8aafba5ed54 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jan 14 05:03:24 2010 +0100
+++ b/lisp/ChangeLog	Wed Jan 13 22:13:16 2010 -0800
@@ -1,3 +1,7 @@
+2010-01-14  Glenn Morris  <rgm@gnu.org>
+
+	* frame.el (show-trailing-whitespace): Safe if boolean.  (Bug#5312)
+
 2010-01-14  Kenichi Handa  <handa@m17n.org>
 
 	* composite.el (auto-composition-mode): Make it a buffer local
diff -r 137aaa9655c5 -r f8aafba5ed54 lisp/frame.el
--- a/lisp/frame.el	Thu Jan 14 05:03:24 2010 +0100
+++ b/lisp/frame.el	Wed Jan 13 22:13:16 2010 -0800
@@ -1525,6 +1525,7 @@
   "Non-nil means highlight trailing whitespace.
 This is done in the face `trailing-whitespace'."
   :type 'boolean
+  :safe 'booleanp
   :group 'whitespace-faces)