[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100601: Merge fix for Bug#8879 from trunk

[Chong Yidong]

------------------------------------------------------------
revno: 100601 [merge]
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sat 2011-06-18 15:23:54 -0400
message:
  Merge fix for Bug#8879 from trunk
modified:
  lisp/ChangeLog
  lisp/textmodes/fill.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-09 09:40:51 +0000
+++ b/lisp/ChangeLog    2011-06-18 19:23:43 +0000
@@ -1,3 +1,7 @@
+2011-06-18  Chong Yidong  <address@hidden>
+
+       * textmodes/fill.el (default-justification): Add :safe (Bug#8879).
+
 2011-06-09  Eli Zaretskii  <address@hidden>
 
        * net/ange-ftp.el (ange-ftp-insert-file-contents): Let-bind

=== modified file 'lisp/textmodes/fill.el'
--- a/lisp/textmodes/fill.el    2011-01-02 23:50:46 +0000
+++ b/lisp/textmodes/fill.el    2011-06-18 19:23:43 +0000
@@ -1053,6 +1053,7 @@
                 (const full)
                 (const center)
                 (const none))
+  :safe 'symbolp
   :group 'fill)
 (make-variable-buffer-local 'default-justification)