summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/shr.el5
1 files 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.