--- a/lisp/apropos.el	Mon Aug 13 11:28:16 2007 +0200
+++ b/lisp/apropos.el	Mon Aug 13 11:29:08 2007 +0200
@@ -107,6 +107,7 @@
 (defvar apropos-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map [(control m)] 'apropos-follow)
+    (define-key map [return] 'apropos-follow)
     (define-key map [(button2up)] 'apropos-mouse-follow)
     (define-key map [(button2)] 'undefined)
     map)
@@ -508,6 +509,9 @@
 	   (let ((p apropos-accumulator)
 		 (old-buffer (current-buffer))
 		 symbol item point1 point2)
+	     ;; Mostly useless but to provide better keymap
+	     ;; explanation. help-mode-map will be used instead.
+	     (use-local-map apropos-mode-map)
 	     ;; XEmacs change from (if window-system
 	     (if (device-on-window-system-p)
 		 (progn
@@ -575,6 +579,8 @@
 				    apropos-item))
 	       (if apropos-symbol-face
 		   (put-text-property point1 point2 'face apropos-symbol-face))
+	       ;; Add text-property on symbol, too.
+	       (put-text-property point1 point2 'keymap apropos-mode-map)
 	       (apropos-print-doc 'describe-function 1
 				  (if (commandp symbol)
 				      "Command"