[Emacs-diffs] scratch/gnus-cloud 864e344 14/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Teodor Zlatanov]

branch: scratch/gnus-cloud
commit 864e344607d9de944fb7fc0d193673d9cab8157a
Merge: e6381fa 288ba2d
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 lisp/gnus/mm-decode.el |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index c653d73..c503953 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1836,7 +1836,6 @@ If RECURSIVE, search recursively."
            (delete-region ,(point-min-marker)
                           ,(point-max-marker))))))))
 
-(defvar shr-map)
 (defvar shr-image-map)
 
 (autoload 'widget-convert-button "wid-edit")
@@ -1852,7 +1851,7 @@ If RECURSIVE, search recursively."
        (widget-convert-button
         'url-link start end
         :help-echo (get-text-property start 'help-echo)
-        :keymap (setq keymap (copy-keymap shr-map))
+        :keymap (setq keymap (copy-keymap shr-image-map))
         (get-text-property start 'shr-url))
        ;; Remove keymap that `shr-urlify' adds.
        (put-text-property start end 'keymap nil)