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 /etc | |
| 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 'etc')
| -rw-r--r-- | etc/HISTORY | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/HISTORY b/etc/HISTORY index ad38b3262d2..301ba33b97e 100644 --- a/etc/HISTORY +++ b/etc/HISTORY | |||
| @@ -211,6 +211,8 @@ GNU Emacs 25.1 (2016-09-16) emacs-25.1 | |||
| 211 | 211 | ||
| 212 | GNU Emacs 25.2 (2017-04-20) emacs-25.2 | 212 | GNU Emacs 25.2 (2017-04-20) emacs-25.2 |
| 213 | 213 | ||
| 214 | GNU Emacs 25.3 (2017-09-11) emacs-25.3 | ||
| 215 | |||
| 214 | 216 | ||
| 215 | ---------------------------------------------------------------------- | 217 | ---------------------------------------------------------------------- |
| 216 | This file is part of GNU Emacs. | 218 | This file is part of GNU Emacs. |