bug#22614: 25.1.50; ../../emacs/lisp/net/eww.el:29:1:Error: Symbol’s value as variable is void: image-map

[Glenn Morris]

Wolfgang Jenkner wrote:

> --- a/lisp/net/shr.el
> +++ b/lisp/net/shr.el
> @@ -189,6 +189,8 @@ shr-map
>      (define-key map "\r" 'shr-browse-url)
>      map))
>  
> +(defvar image-map nil)                  ;in case image.el is not pre-loaded
> +

This (ie, defining something from image.el in shr.el just to stop a void
variable error) seems sub-optimal to me. Can't shr use something like
"(when (featurep 'image) ...)" instead?