| commit | b3fd6831dc38c1e1fedc4c9fbf344662384fa10a | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Tue, 12 Sep 2017 16:24:43 +0000 (12 09:24 -0700) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Tue, 12 Sep 2017 16:26:37 +0000 (12 09:26 -0700) | ||
| tree | c9fe4ed5feae3013dadc0e01976fa607bc28bb37 | treesnapshot (tar.gz zip) |
| parent | 35c893ddaf21b93677850a69709b59630bb0feb7 | commitdiff |
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.
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.
| ChangeLog.2 | diffblobblamehistory | |
| etc/HISTORY | diffblobblamehistory | |
| lisp/gnus/mm-view.el | diffblobblamehistory | |
| lisp/textmodes/enriched.el | diffblobblamehistory |