--- a/lisp/hyper-apropos.el	Mon Aug 13 11:01:58 2007 +0200
+++ b/lisp/hyper-apropos.el	Mon Aug 13 11:03:08 2007 +0200
@@ -481,7 +481,6 @@
 	(setq hyper-apropos-prev-wconfig (current-window-configuration)))
     (hyper-apropos-get-doc symbol t nil this-ref-buffer)))
 
-;;;###autoload
 (defun hyper-where-is (symbol)
   "Print message listing key sequences that invoke specified command."
   (interactive (list (hyper-apropos-read-function-symbol "Where is function")))
@@ -1080,13 +1079,6 @@
 	       nil
 	     (forward-char 3)
 	     (read (point-marker))))
-	  ;; What's this?  This ends up in the same symbol already described.
-;;	  ((and
-;;	    (eq major-mode 'hyper-apropos-help-mode)
-;;	    (> (point) (point-min)))
-;;	   (save-excursion
-;;	     (goto-char (point-min))
-;;	     (hyper-apropos-this-symbol)))
 	  (t
 	   (let* ((st (progn
 			(skip-syntax-backward "w_")
@@ -1129,6 +1121,11 @@
   (interactive
    (let ((var (hyper-apropos-this-symbol)))
      (or (and var (boundp var))
+	 (and (setq var (and (eq major-mode 'hyper-apropos-help-mode)
+			     (save-excursion
+			       (goto-char (point-min))
+			       (hyper-apropos-this-symbol))))
+	      (boundp var))
 	 (setq var nil))
      (list var (hyper-apropos-read-variable-value var))))
   (and var
@@ -1178,10 +1175,7 @@
 (defun hyper-apropos-customize-variable ()
   (interactive)
   (let ((var (hyper-apropos-this-symbol)))
-    (and
-     (or (and var (boundp var))
-	 (setq var nil))
-     (customize-variable var))))
+    (customize-variable var)))
 
 ;; ---------------------------------------------------------------------- ;;
 
@@ -1203,6 +1197,11 @@
   (interactive
    (let ((fn (hyper-apropos-this-symbol)))
      (or (fboundp fn)
+	 (and (setq fn (and (eq major-mode 'hyper-apropos-help-mode)
+			    (save-excursion
+			      (goto-char (point-min))
+			      (hyper-apropos-this-symbol))))
+	      (fboundp fn))
 	 (setq fn nil))
      (list fn)))
   (if fn
@@ -1258,7 +1257,11 @@
 (defun hyper-apropos-popup-menu (event)
   (interactive "e")
   (mouse-set-point event)
-  (let* ((sym (hyper-apropos-this-symbol))
+  (let* ((sym (or (hyper-apropos-this-symbol)
+		  (and (eq major-mode 'hyper-apropos-help-mode)
+		       (save-excursion
+			 (goto-char (point-min))
+			 (hyper-apropos-this-symbol)))))
 	 (notjunk (not (null sym)))
 	 (command-p (if (commandp sym) t))
 	 (variable-p (and sym (boundp sym)))