[Emacs-diffs] Changes to emacs/lisp/help-fns.el,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       06/12/17 22:14:11

Index: help-fns.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/help-fns.el,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- help-fns.el 9 Dec 2006 12:55:33 -0000       1.93
+++ help-fns.el 17 Dec 2006 22:14:11 -0000      1.94
@@ -575,8 +575,11 @@
                             (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 @@
                (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)