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

[Stefan Monnier]

Index: emacs/lisp/help-fns.el
diff -c emacs/lisp/help-fns.el:1.9 emacs/lisp/help-fns.el:1.10
*** emacs/lisp/help-fns.el:1.9  Wed May  8 14:02:28 2002
--- emacs/lisp/help-fns.el      Sun Jun 23 17:02:45 2002
***************
*** 1,6 ****
  ;;; help-fns.el --- Complex help functions
  
! ;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001
  ;;   Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
--- 1,6 ----
  ;;; help-fns.el --- Complex help functions
  
! ;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002
  ;;   Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
***************
*** 115,121 ****
    (catch 'answer
      (dolist (dir (or path load-path))
        (dolist (suf (append (unless nosuffix load-suffixes) '("")))
!       (let ((try (expand-file-name (concat library suf) dir)))
          (and (file-readable-p try)
               (null (file-directory-p try))
               (progn
--- 115,121 ----
    (catch 'answer
      (dolist (dir (or path load-path))
        (dolist (suf (append (unless nosuffix load-suffixes) '("")))
!         (let ((try (expand-file-name (concat library suf) dir)))
          (and (file-readable-p try)
               (null (file-directory-p try))
               (progn
***************
*** 215,221 ****
        ;; This is necessary only for defaliases.
        (let ((location
             (condition-case nil
!                (find-function-search-for-symbol function nil "loaddefs.el") 
               (error nil))))
        (when location
          (with-current-buffer (car location)
--- 215,221 ----
        ;; This is necessary only for defaliases.
        (let ((location
             (condition-case nil
!                (find-function-search-for-symbol function nil "loaddefs.el")
               (error nil))))
        (when location
          (with-current-buffer (car location)
***************
*** 350,356 ****
                                (if (symbolp v) (symbol-name v))))
       (list (if (equal val "")
               v (intern val)))))
!   (unless (bufferp buffer) (setq buffer (current-buffer)))
    (if (not (symbolp variable))
        (message "You did not specify a variable")
      (save-excursion
--- 350,356 ----
                                (if (symbolp v) (symbol-name v))))
       (list (if (equal val "")
               v (intern val)))))
!   (unless (buffer-live-p buffer) (setq buffer (current-buffer)))
    (if (not (symbolp variable))
        (message "You did not specify a variable")
      (save-excursion
***************
*** 392,400 ****
                      (pp val)
                      (help-xref-on-pp from (point))
                      (if (< (point) (+ from 20))
!                         (save-excursion
!                           (goto-char from)
!                           (delete-char -1)))))))
              (terpri))
            (terpri)
            (with-current-buffer standard-output
--- 392,398 ----
                      (pp val)
                      (help-xref-on-pp from (point))
                      (if (< (point) (+ from 20))
!                       (delete-region (1- from) from))))))
              (terpri))
            (terpri)
            (with-current-buffer standard-output
***************
*** 421,426 ****
--- 419,432 ----
                  (insert "Automatically becomes buffer-local when set in any 
fashion.\n"))))
            (princ "Documentation:")
            (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.")))