Merge fix for Bug#8879 from trunk

2 files changed, 5 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47da6d77c90..d38aad95067 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * textmodes/fill.el (default-justification): Add :safe (Bug#8879).
+
 2011-06-09  Eli Zaretskii  <eliz@gnu.org>
 
         * net/ange-ftp.el (ange-ftp-insert-file-contents): Let-bind
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 044806ef5b0..8c2b54b05d8 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -1053,6 +1053,7 @@ The `justification' text-property can locally override this variable."
                  (const full)
                  (const center)
                  (const none))
+  :safe 'symbolp
   :group 'fill)
 (make-variable-buffer-local 'default-justification)