aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2016-09-26 22:34:53 +0000
committerKatsumi Yamaoka2016-09-26 22:34:53 +0000
commit5b734087b18e4596cdf2fa34806e092c4b532db1 (patch)
treecb6548f2908d31790f494009762b7b0d61f2154c
parent9fc9988d4d08028fb37c588f5e0483ac85b713d3 (diff)
downloademacs-5b734087b18e4596cdf2fa34806e092c4b532db1.tar.gz
emacs-5b734087b18e4596cdf2fa34806e092c4b532db1.zip
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).
-rw-r--r--lisp/gnus/mm-decode.el2
1 files changed, 0 insertions, 2 deletions
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."
1910 :help-echo (get-text-property start 'help-echo) 1910 :help-echo (get-text-property start 'help-echo)
1911 :keymap (setq keymap (copy-keymap shr-map)) 1911 :keymap (setq keymap (copy-keymap shr-map))
1912 (get-text-property start 'shr-url)) 1912 (get-text-property start 'shr-url))
1913 ;; Remove keymap that `shr-urlify' adds.
1914 (put-text-property start end 'keymap nil)
1915 ;; Mask keys that launch `widget-button-click'. 1913 ;; Mask keys that launch `widget-button-click'.
1916 ;; Those bindings are provided by `widget-keymap' 1914 ;; Those bindings are provided by `widget-keymap'
1917 ;; that is a parent of `gnus-article-mode-map'. 1915 ;; that is a parent of `gnus-article-mode-map'.