[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 395f2ad: Don't use image-map if it isn't defined
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 395f2ad: Don't use image-map if it isn't defined |
Date: |
Thu, 11 Feb 2016 03:52:13 +0000 |
branch: master
commit 395f2ad689825f83702cbadc16b9da83493a9929
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
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 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index b1f2f07..46aea79 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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 395f2ad: Don't use image-map if it isn't defined,
Lars Ingebrigtsen <=