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

Fixes: debbugs:10917

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c573b9de5b986b77c8a80d7b985344529ff3da28..2453dc2177a85164f8654be53d10ab94f565039f 100644 (file)
--- 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 52ac5434ce1de205ebaa2f09aa847ee00a72702a..a1bd4d653858a645f44e577b48bd7da6955bff80 100644 (file)
--- 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)