(describe-variable): Improve blank separator lines.

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index e4d77e3447c93a1a7c664f14b5b82ccd10fcf3a5..740504c95a65b912e5dd40b042e03e3ba187a0f2 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -575,8 +575,11 @@ it is displayed along with the global value."
                             (documentation-property alias 'variable-documentation))))
               (unless (eq alias variable)
                 (princ (format "\nThis variable is an alias for `%s'.\n" alias)))
+             (if (or obsolete safe-var)
+                 (terpri))
+
               (when obsolete
-                (princ "\nThis variable is obsolete")
+                (princ "This variable is obsolete")
                 (if (cdr obsolete) (princ (format " since %s" (cdr obsolete))))
                 (princ ";") (terpri)
                 (princ (if (stringp (car obsolete)) (car obsolete)
@@ -587,9 +590,8 @@ it is displayed along with the global value."
                (princ "if its value\nsatisfies the predicate ")
                (princ (if (byte-code-function-p safe-var)
                           "which is byte-compiled expression.\n"
-                        (format "`%s'.\n" safe-var)))
-               (terpri))
-             (princ "Documentation:\n")
+                        (format "`%s'.\n" safe-var))))
+             (princ "\nDocumentation:\n")
               (princ (or doc "Not documented as a variable.")))
            ;; Make a link to customize if this variable can be customized.
            (if (custom-variable-p variable)