From 395f2ad689825f83702cbadc16b9da83493a9929 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Thu, 11 Feb 2016 14:51:49 +1100 Subject: [PATCH] Don't use image-map if it isn't defined * lisp/net/shr.el (shr-image-map): Only use image-map as a parent if it's defined (bug#22614). --- lisp/net/shr.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lisp/net/shr.el b/lisp/net/shr.el index b1f2f0794a7..46aea79c327 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -189,11 +189,10 @@ and other things: (define-key map "\r" 'shr-browse-url) map)) -(defvar image-map nil) ;in case image.el is not pre-loaded - (defvar shr-image-map (let ((map (copy-keymap shr-map))) - (set-keymap-parent map image-map) + (when (boundp 'image-map) + (set-keymap-parent map image-map)) map)) ;; Public functions and commands. -- 2.39.2