(help-xref-interned): Fix insertion of fdoc and revamp.

diff --git a/lisp/help.el b/lisp/help.el
index 9d0c4e856aaf7b654c7bf7648690f56e9ae3db6d..f5ed123a6f3ba86ba7a3fc72af287db9b437a646 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1095,12 +1095,12 @@ help buffer."
   (let ((fdoc (describe-function symbol)))
     (describe-variable symbol)
     ;; We now have a help buffer on the variable.  Insert the function
-    ;; text after it.
-    (goto-char (point-max))
-    (let ((inhibit-read-only t))
-      (insert "\n\n" fdoc)))
-  (goto-char (point-min))
-  (help-setup-xref (list #'help-xref-interned symbol) nil))
+    ;; text before it.
+    (with-current-buffer "*Help*"
+      (goto-char (point-min))
+      (let ((inhibit-read-only t))
+       (insert fdoc "\n\n" (symbol-name symbol) " is also a variable.\n\n"))
+      (help-setup-xref (list #'help-xref-interned symbol) nil))))
 
 (defun help-xref-mode (buffer)
   "Do a `describe-mode' for the specified BUFFER."