summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/frame.el1
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60a443223be..2b14d89c325 100644
--- 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 e2ae65f1ccc..0628db7ee38 100644
--- 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)