diff options
| author | Tino Calancha <tino.calancha@gmail.com> | 2018-04-14 12:56:22 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2018-04-14 12:56:22 +0200 |
| commit | e1c2ec50862024f1db1f37d895ae119877fe30ce (patch) | |
| tree | 3c06fe001541f9d0f994396d43830077486bd645 /lisp/gnus/mm-decode.el | |
| parent | 682118f5a06eebdc38767047e65d42aa9356cfe8 (diff) | |
| download | emacs-e1c2ec50862024f1db1f37d895ae119877fe30ce.tar.gz emacs-e1c2ec50862024f1db1f37d895ae119877fe30ce.tar.bz2 emacs-e1c2ec50862024f1db1f37d895ae119877fe30ce.zip | |
Subject: Fix circular dependency for mm-decode
* lisp/gnus/mm-decode.el: Do not require shr.el at the top
of the file; `mm-shr' already requires shr.el in its body, and
this function is the only `mm-convert-shr-links' caller (Bug#31151).
Diffstat (limited to 'lisp/gnus/mm-decode.el')
| -rw-r--r-- | lisp/gnus/mm-decode.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 69fc770ec72..18c5837dd54 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -25,7 +25,6 @@ (require 'mail-parse) (require 'mm-bodies) -(require 'shr) (eval-when-compile (require 'cl-lib)) (autoload 'gnus-map-function "gnus-util") @@ -1842,6 +1841,8 @@ text/html;\\s-*charset=\\([^\t\n\r \"'>]+\\)[^>]*>" nil t) (let ((inhibit-read-only t)) (delete-region min max)))))))) +(defvar shr-image-map) +(defvar shr-map) (autoload 'widget-convert-button "wid-edit") (defvar widget-keymap) |