From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 26 Sep 2016 22:34:53 +0000 (+0000)
Subject: Backport mm-convert-shr-links fix from master (bug#23964)
X-Git-Tag: emacs-25.1.90~157
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5b734087b18e4596cdf2fa34806e092c4b532db1;p=emacs.git

Backport mm-convert-shr-links fix from master (bug#23964)

* lisp/gnus/mm-decode.el (mm-convert-shr-links):
Preserve key bindings that shr adds (bug#23964).
---

diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index bb8e2038d26..b6532b3b262 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1910,8 +1910,6 @@ If RECURSIVE, search recursively."
 	 :help-echo (get-text-property start 'help-echo)
 	 :keymap (setq keymap (copy-keymap shr-map))
 	 (get-text-property start 'shr-url))
-	;; Remove keymap that `shr-urlify' adds.
-	(put-text-property start end 'keymap nil)
 	;; Mask keys that launch `widget-button-click'.
 	;; Those bindings are provided by `widget-keymap'
 	;; that is a parent of `gnus-article-mode-map'.