diff options
| author | Paul Eggert | 2017-09-12 09:24:43 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-09-12 09:26:37 -0700 |
| commit | b3fd6831dc38c1e1fedc4c9fbf344662384fa10a (patch) | |
| tree | c9fe4ed5feae3013dadc0e01976fa607bc28bb37 /ChangeLog.2 | |
| parent | 35c893ddaf21b93677850a69709b59630bb0feb7 (diff) | |
| download | emacs-b3fd6831dc38c1e1fedc4c9fbf344662384fa10a.tar.gz emacs-b3fd6831dc38c1e1fedc4c9fbf344662384fa10a.zip | |
Merge Emacs 25.3 fixes
The security patches released for Emacs 25.3 were less drastic
than what we had immediately put into master. Adjust master to
match 25.3 (Bug#28350).
* lisp/textmodes/enriched.el (enriched-translations):
Re-enable FUNCTION and display translations that are safe.
(enriched-handle-display-prop): Bring back.
(enriched-decode-display-prop): Bring back, but disable
the unsafe part.
Diffstat (limited to 'ChangeLog.2')
| -rw-r--r-- | ChangeLog.2 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2 index bf52ac0ef1d..bd1800b3307 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 | |||
| @@ -1,3 +1,17 @@ | |||
| 1 | 2017-09-11 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * etc/NEWS: Document the vulnerability and its resolution. | ||
| 4 | Include a workaround. Suggested by Charles A. Roelli | ||
| 5 | <charles@aurox.ch>. | ||
| 6 | |||
| 7 | * lisp/gnus/mm-view.el (mm-inline-text): Disable decoding of | ||
| 8 | "enriched" and "richtext" MIME objects. Suggested by Lars | ||
| 9 | Ingebrigtsen <larsi@gnus.org>. | ||
| 10 | |||
| 11 | * lisp/textmodes/enriched.el (enriched-decode-display-prop): | ||
| 12 | Don't produce 'display' properties. (Bug#28350) | ||
| 13 | |||
| 14 | |||
| 1 | 2017-04-20 Nicolas Petton <nicolas@petton.fr> | 15 | 2017-04-20 Nicolas Petton <nicolas@petton.fr> |
| 2 | 16 | ||
| 3 | * Version 25.2 released. | 17 | * Version 25.2 released. |