From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 18 Jun 2011 19:23:43 +0000 (-0400)
Subject: Merge fix for Bug#8879 from trunk
X-Git-Tag: emacs-pretest-24.0.90~104^3~25
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c9e799dbb100c5161f7a485452d29f554d95e6c7;p=emacs.git

Merge fix for Bug#8879 from trunk
---

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)