aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-01-13 22:13:16 -0800
committerGlenn Morris2010-01-13 22:13:16 -0800
commit3a4f3a3b0a9aaea2d11a4de746f2b30ae1a39ce7 (patch)
treeb6140a400a515aca7c463ffdcba4120833ef5090
parent49caf252e5ce443b3a67b3e410c6ee1226b7beb7 (diff)
downloademacs-3a4f3a3b0a9aaea2d11a4de746f2b30ae1a39ce7.tar.gz
emacs-3a4f3a3b0a9aaea2d11a4de746f2b30ae1a39ce7.zip
(show-trailing-whitespace): Safe if boolean. (Bug#5312)
-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 @@
12010-01-14 Glenn Morris <rgm@gnu.org>
2
3 * frame.el (show-trailing-whitespace): Safe if boolean. (Bug#5312)
4
12010-01-14 Kenichi Handa <handa@m17n.org> 52010-01-14 Kenichi Handa <handa@m17n.org>
2 6
3 * composite.el (auto-composition-mode): Make it a buffer local 7 * 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."
1525 "Non-nil means highlight trailing whitespace. 1525 "Non-nil means highlight trailing whitespace.
1526This is done in the face `trailing-whitespace'." 1526This is done in the face `trailing-whitespace'."
1527 :type 'boolean 1527 :type 'boolean
1528 :safe 'booleanp
1528 :group 'whitespace-faces) 1529 :group 'whitespace-faces)
1529 1530
1530 1531