diff options
| author | Chong Yidong | 2011-06-18 15:21:16 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-06-18 15:21:16 -0400 |
| commit | 770802895c7ae570e1161e0216d65abe0eea2893 (patch) | |
| tree | a8e71bbd7a82633f5f1c6e0b4e1d295fe1e420d8 | |
| parent | 7d7d00451f78eafdad6d9c06e51de544137e64fb (diff) | |
| download | emacs-770802895c7ae570e1161e0216d65abe0eea2893.tar.gz emacs-770802895c7ae570e1161e0216d65abe0eea2893.zip | |
* lisp/textmodes/fill.el (default-justification): Add :safe (Bug#8879).
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/textmodes/fill.el | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 012397968d9..61afa87201b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-06-18 Chong Yidong <cyd@stupidchicken.com> | 1 | 2011-06-18 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * textmodes/fill.el (default-justification): Add :safe (Bug#8879). | ||
| 4 | |||
| 3 | * cus-face.el (custom-declare-face): Call custom-theme-recalc face | 5 | * cus-face.el (custom-declare-face): Call custom-theme-recalc face |
| 4 | anytime existing face settings are present (Bug#8889). | 6 | anytime existing face settings are present (Bug#8889). |
| 5 | 7 | ||
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 2b7e9a19baa..a85ed982ab0 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el | |||
| @@ -1054,6 +1054,7 @@ The `justification' text-property can locally override this variable." | |||
| 1054 | (const full) | 1054 | (const full) |
| 1055 | (const center) | 1055 | (const center) |
| 1056 | (const none)) | 1056 | (const none)) |
| 1057 | :safe 'symbolp | ||
| 1057 | :group 'fill) | 1058 | :group 'fill) |
| 1058 | (make-variable-buffer-local 'default-justification) | 1059 | (make-variable-buffer-local 'default-justification) |
| 1059 | 1060 | ||