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

[Juanma Barranquero]

Index: emacs/lisp/help-fns.el
diff -c emacs/lisp/help-fns.el:1.15 emacs/lisp/help-fns.el:1.16
*** emacs/lisp/help-fns.el:1.15 Fri Jul 12 19:26:17 2002
--- emacs/lisp/help-fns.el      Mon Jul 15 11:38:49 2002
***************
*** 435,457 ****
                  (forward-line -1)
                  (insert "Automatically becomes buffer-local when set in any 
fashion.\n"))))
            ;; Mention if it's an alias
!             (let ((alias (condition-case nil
                               (indirect-variable variable)
!                            (error variable))))
                (unless (eq alias variable)
                  (princ (format "This variable is an alias for `%s'." alias))
                  (terpri)
!                 (terpri)))
!           (let ((obsolete (get variable 'byte-obsolete-variable)))
!             (when obsolete
!               (princ "This variable is obsolete")
!               (if (cdr obsolete) (princ (format " since %s" (cdr obsolete))))
!               (princ "; ") (terpri)
!               (princ (if (stringp (car obsolete)) (car obsolete)
!                        (format "use `%s' instead." (car obsolete))))
!               (terpri)))
!           (let ((doc (documentation-property variable 
'variable-documentation)))
!             (princ (or doc "Not documented as a variable.")))
            ;; Make a link to customize if this variable can be customized.
            ;; Note, it is not reliable to test only for a custom-type property
            ;; because those are only present after the var's definition
--- 435,459 ----
                  (forward-line -1)
                  (insert "Automatically becomes buffer-local when set in any 
fashion.\n"))))
            ;; Mention if it's an alias
!             (let* ((alias (condition-case nil
                               (indirect-variable variable)
!                            (error variable)))
!                    (obsolete (get variable 'byte-obsolete-variable))
!                    (doc (or (documentation-property variable 
'variable-documentation)
!                             (documentation-property alias 
'variable-documentation))))
                (unless (eq alias variable)
                  (princ (format "This variable is an alias for `%s'." alias))
                  (terpri)
!                 (terpri))
!               (when obsolete
!                 (princ "This variable is obsolete")
!                 (if (cdr obsolete) (princ (format " since %s" (cdr 
obsolete))))
!                 (princ "; ") (terpri)
!                 (princ (if (stringp (car obsolete)) (car obsolete)
!                          (format "use `%s' instead." (car obsolete))))
!                 (terpri)
!                 (terpri))
!               (princ (or doc "Not documented as a variable.")))
            ;; Make a link to customize if this variable can be customized.
            ;; Note, it is not reliable to test only for a custom-type property
            ;; because those are only present after the var's definition