diff options
| author | Chong Yidong | 2011-06-18 15:23:43 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-06-18 15:23:43 -0400 |
| commit | c9e799dbb100c5161f7a485452d29f554d95e6c7 (patch) | |
| tree | 35e0469033b3b64ffe83f0a971f33e907667e11c /lisp/ChangeLog | |
| parent | 989b42d2c7e50480d1bec3503239a3da22a38ae7 (diff) | |
| download | emacs-c9e799dbb100c5161f7a485452d29f554d95e6c7.tar.gz emacs-c9e799dbb100c5161f7a485452d29f554d95e6c7.zip | |
Merge fix for Bug#8879 from trunk
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 4 |
1 files changed, 4 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 @@ | |||
| 1 | 2011-06-18 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * textmodes/fill.el (default-justification): Add :safe (Bug#8879). | ||
| 4 | |||
| 1 | 2011-06-09 Eli Zaretskii <eliz@gnu.org> | 5 | 2011-06-09 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * net/ange-ftp.el (ange-ftp-insert-file-contents): Let-bind | 7 | * net/ange-ftp.el (ange-ftp-insert-file-contents): Let-bind |