* lisp/wid-edit.el (link): Remove :follow-link property (bug#22434)

* lisp/recentf.el (recentf-dialog-mode-map): Remove unecessary mapping.

diff --git a/lisp/recentf.el b/lisp/recentf.el
index df7f3e2e56525d41a51a7c01cfd832475580c7b2..3321f2fe1010e0f93cc14ba7402e4ac105626838 100644 (file)
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -1064,7 +1064,6 @@ Go to the beginning of buffer if not found."
     (define-key km "q" 'recentf-cancel-dialog)
     (define-key km "n" 'next-line)
     (define-key km "p" 'previous-line)
-    (define-key km [follow-link] "\C-m")
     km)
   "Keymap used in recentf dialogs.")
 

diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 0a0f4582b32be5091632099dc722db68350838df..9ede9a5633f76c99eeb9066ad5003d1a241164a6 100644 (file)
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -1789,7 +1789,13 @@ If END is omitted, it defaults to the length of LIST."
   "An embedded link."
   :button-prefix 'widget-link-prefix
   :button-suffix 'widget-link-suffix
-  :follow-link 'mouse-face
+  ;; The `follow-link' property should only be used in those contexts where the
+  ;; mouse-1 event normally doesn't follow the link, yet the `link' widget
+  ;; seems to almost always be used in contexts where (down-)mouse-1 is bound
+  ;; to `widget-button-click' and hence the "mouse-1 to mouse-2" remapping is
+  ;; not necessary (and can even be harmful).  So let's not add a :follow-link
+  ;; by default.  See (bug#22434).
+  ;; :follow-link 'mouse-face
   :help-echo "Follow the link."
   :format "%[%t%]")