diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-12 09:24:43 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-12 09:26:37 -0700 |
| commit | b3fd6831dc38c1e1fedc4c9fbf344662384fa10a (patch) | |
| tree | c9fe4ed5feae3013dadc0e01976fa607bc28bb37 /lisp/gnus | |
| parent | 35c893ddaf21b93677850a69709b59630bb0feb7 (diff) | |
| download | emacs-b3fd6831dc38c1e1fedc4c9fbf344662384fa10a.tar.gz emacs-b3fd6831dc38c1e1fedc4c9fbf344662384fa10a.tar.bz2 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 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/mm-view.el | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index 3698f4d9cf7..fb80e6bf3cb 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -362,6 +362,12 @@ (goto-char (point-max)))) (save-restriction (narrow-to-region b (point)) + ;; Disabled in Emacs 25.3 to avoid execution of arbitrary Lisp + ;; forms in display properties supported by enriched.el. + ;; (when (member type '("enriched" "richtext")) + ;; (set-text-properties (point-min) (point-max) nil) + ;; (ignore-errors + ;; (enriched-decode (point-min) (point-max)))) (mm-handle-set-undisplayer handle `(lambda () |