From: Tino Calancha <tino.calancha@gmail.com>
Date: Sat, 14 Apr 2018 10:56:22 +0000 (+0200)
Subject: Subject: Fix circular dependency for mm-decode
X-Git-Tag: emacs-27.0.90~5228
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e1c2ec50862024f1db1f37d895ae119877fe30ce;p=emacs.git

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).
---

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)