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

[Richard M. Stallman]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.303 emacs/lisp/subr.el:1.304
*** emacs/lisp/subr.el:1.303    Thu May  2 01:30:58 2002
--- emacs/lisp/subr.el  Sun May 12 12:41:11 2002
***************
*** 1804,1810 ****
  (defun functionp (object)
    "Non-nil iff OBJECT is a type of object that can be called as a function."
    (or (and (symbolp object) (fboundp object)
!          (setq object (indirect-function object))
           (eq (car-safe object) 'autoload)
           (not (car-safe (cdr-safe (cdr-safe (cdr-safe (cdr-safe object)))))))
        (subrp object) (byte-code-function-p object)
--- 1804,1812 ----
  (defun functionp (object)
    "Non-nil iff OBJECT is a type of object that can be called as a function."
    (or (and (symbolp object) (fboundp object)
!          (condition-case nil
!              (setq object (indirect-function object))
!            (error nil))
           (eq (car-safe object) 'autoload)
           (not (car-safe (cdr-safe (cdr-safe (cdr-safe (cdr-safe object)))))))
        (subrp object) (byte-code-function-p object)