Merge fix for Bug#8879 from trunk

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47da6d77c9003fcc737479233f70c473a84d5b47..d38aad9506785a1b1bcfdcd54ce7922ae3fafaa4 100644 (file)
--- 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 044806ef5b0a799a1ce4bcf349f1adbc04a6cc5c..8c2b54b05d89100c16216b289fe9de601eb9a1e2 100644 (file)
--- 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)