diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-06-18 15:23:43 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-06-18 15:23:43 -0400 |
| commit | c9e799dbb100c5161f7a485452d29f554d95e6c7 (patch) | |
| tree | 35e0469033b3b64ffe83f0a971f33e907667e11c | |
| parent | 989b42d2c7e50480d1bec3503239a3da22a38ae7 (diff) | |
| download | emacs-c9e799dbb100c5161f7a485452d29f554d95e6c7.tar.gz | |
Merge fix for Bug#8879 from trunk
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/textmodes/fill.el | 1 |
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) |