* lisp/ehelp.el (electric-help-map): Use button-buffer-map.

Fixes: debbugs:10917

2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c573b9de5b9..2453dc2177a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,8 @@
 2012-10-06  Glenn Morris  <rgm@gnu.org>
 
         * ehelp.el (electric-help-mode): Use help-mode rather than
-        non-existent mode `help'.  (Bug#10917)
+        non-existent mode `help'.
+        (electric-help-map): Use button-buffer-map.  (Bug#10917)
 
         * textmodes/reftex-vars.el (reftex-create-bibtex-header)
         (reftex-create-bibtex-footer): Fix custom types.
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index 52ac5434ce1..a1bd4d65385 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -61,6 +61,8 @@
 
 (defvar electric-help-map
   (let ((map (make-keymap)))
+    ;; FIXME fragile.  Should derive from help-mode-map in a smarter way.
+    (set-keymap-parent map button-buffer-map)
     ;; allow all non-self-inserting keys - search, scroll, etc, but
     ;; let M-x and C-x exit ehelp mode and retain buffer:
     (suppress-keymap map)