(show-trailing-whitespace): Safe if boolean. (Bug#5312)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60a443223beb5cc085271cdfc6138af4c0ee04f3..2b14d89c3258b8c595297399892474b09787bbac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/frame.el b/lisp/frame.el
index e2ae65f1ccc0079c6c495b294a84921726f6b5cc..0628db7ee389f09da00edef7f26d685eec822e0f 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1525,6 +1525,7 @@ left untouched.  FRAME nil or omitted means use the selected frame."
   "Non-nil means highlight trailing whitespace.
 This is done in the face `trailing-whitespace'."
   :type 'boolean
+  :safe 'booleanp
   :group 'whitespace-faces)