diff options
| author | Joakim Verona | 2013-08-12 12:29:06 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-12 12:29:06 +0200 |
| commit | 5ff84f8a17c73bf63cc7532e14149380d9f83b3f (patch) | |
| tree | 501ac3b99a49aaa25adedc516bb4ea7a34c22a5c /lisp/ChangeLog | |
| parent | c39e73975f7371a6458cd63967d39ba77a1e871a (diff) | |
| parent | 7a67e06b99a85ae700a7ccc75468397d53af59ed (diff) | |
| download | emacs-5ff84f8a17c73bf63cc7532e14149380d9f83b3f.tar.gz emacs-5ff84f8a17c73bf63cc7532e14149380d9f83b3f.zip | |
merge from trunk
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ac360a3e422..1b7aceb5979 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2013-08-12 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * format.el (format-annotate-function): | ||
| 4 | Handle read-only text properties in the source. (Bug#14887) | ||
| 5 | |||
| 6 | 2013-08-11 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 7 | |||
| 8 | * net/eww.el (eww-display-html): Ignore coding system errors. One | ||
| 9 | web site uses "utf-8lias" as the coding system. | ||
| 10 | |||
| 1 | 2013-08-11 Juanma Barranquero <lekktu@gmail.com> | 11 | 2013-08-11 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 12 | ||
| 3 | * frameset.el (frameset-valid-p): Fix check; STATES can indeed be nil. | 13 | * frameset.el (frameset-valid-p): Fix check; STATES can indeed be nil. |