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

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/bytecomp.el
diff -c emacs/lisp/emacs-lisp/bytecomp.el:2.157 
emacs/lisp/emacs-lisp/bytecomp.el:2.158
*** emacs/lisp/emacs-lisp/bytecomp.el:2.157     Tue Nov  9 10:33:11 2004
--- emacs/lisp/emacs-lisp/bytecomp.el   Thu Nov 11 22:44:45 2004
***************
*** 1,7 ****
  ;;; bytecomp.el --- compilation of Lisp code into byte code
  
! ;; Copyright (C) 1985,86,87,92,94,1998,2000,01,02,03,2004
! ;;   Free Software Foundation, Inc.
  
  ;; Author: Jamie Zawinski <address@hidden>
  ;;    Hallvard Furuseth <address@hidden>
--- 1,7 ----
  ;;; bytecomp.el --- compilation of Lisp code into byte code
  
! ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1998, 2000, 2001, 2002,
! ;;   2003, 2004  Free Software Foundation, Inc.
  
  ;; Author: Jamie Zawinski <address@hidden>
  ;;    Hallvard Furuseth <address@hidden>
***************
*** 1215,1223 ****
          (if cons
              (or (memq n (cdr cons))
                  (setcdr cons (cons n (cdr cons))))
!           (setq byte-compile-unresolved-functions
!                 (cons (list (car form) n)
!                       byte-compile-unresolved-functions)))))))
  
  (defun byte-compile-format-warn (form)
    "Warn if FORM is `format'-like with inconsistent args.
--- 1215,1222 ----
          (if cons
              (or (memq n (cdr cons))
                  (setcdr cons (cons n (cdr cons))))
!           (push (list (car form) n)
!                 byte-compile-unresolved-functions))))))
  
  (defun byte-compile-format-warn (form)
    "Warn if FORM is `format'-like with inconsistent args.
***************
*** 2129,2137 ****
           (eq (car (nth 1 form)) 'quote)
           (consp (cdr (nth 1 form)))
           (symbolp (nth 1 (nth 1 form))))
!       (add-to-list 'byte-compile-function-environment
!                  (cons (nth 1 (nth 1 form))
!                        (cons 'autoload (cdr (cdr form))))))
    (if (stringp (nth 3 form))
        form
      ;; No doc string, so we can compile this as a normal form.
--- 2128,2136 ----
           (eq (car (nth 1 form)) 'quote)
           (consp (cdr (nth 1 form)))
           (symbolp (nth 1 (nth 1 form))))
!       (push (cons (nth 1 (nth 1 form))
!                 (cons 'autoload (cdr (cdr form))))
!           byte-compile-function-environment))
    (if (stringp (nth 3 form))
        form
      ;; No doc string, so we can compile this as a normal form.
***************
*** 3614,3620 ****
  (byte-defop-compiler-1 defconst byte-compile-defvar)
  (byte-defop-compiler-1 autoload)
  (byte-defop-compiler-1 lambda byte-compile-lambda-form)
- (byte-defop-compiler-1 defalias)
  
  (defun byte-compile-defun (form)
    ;; This is not used for file-level defuns with doc strings.
--- 3613,3618 ----
***************
*** 3716,3722 ****
    (error "`lambda' used as function name is invalid"))
  
  ;; Compile normally, but deal with warnings for the function being defined.
! (defun byte-compile-defalias (form)
    (if (and (consp (cdr form)) (consp (nth 1 form))
           (eq (car (nth 1 form)) 'quote)
           (consp (cdr (nth 1 form)))
--- 3714,3721 ----
    (error "`lambda' used as function name is invalid"))
  
  ;; Compile normally, but deal with warnings for the function being defined.
! (put 'defalias 'byte-hunk-handler 'byte-compile-file-form-defalias)
! (defun byte-compile-file-form-defalias (form)
    (if (and (consp (cdr form)) (consp (nth 1 form))
           (eq (car (nth 1 form)) 'quote)
           (consp (cdr (nth 1 form)))
***************
*** 3728,3737 ****
                  (consp (cdr (nth 2 form)))
                  (symbolp (nth 1 (nth 2 form))))))
        (byte-compile-defalias-warn (nth 1 (nth 1 form)))
!       (setq byte-compile-function-environment
!             (cons (cons (nth 1 (nth 1 form))
!                         (if constant (nth 1 (nth 2 form)) t))
!                   byte-compile-function-environment))))
    (byte-compile-normal-call form))
  
  ;; Turn off warnings about prior calls to the function being defalias'd.
--- 3727,3735 ----
                  (consp (cdr (nth 2 form)))
                  (symbolp (nth 1 (nth 2 form))))))
        (byte-compile-defalias-warn (nth 1 (nth 1 form)))
!       (push (cons (nth 1 (nth 1 form))
!                   (if constant (nth 1 (nth 2 form)) t))
!             byte-compile-function-environment)))
    (byte-compile-normal-call form))
  
  ;; Turn off warnings about prior calls to the function being defalias'd.
***************
*** 4116,4120 ****
  
  (run-hooks 'bytecomp-load-hook)
  
! ;;; arch-tag: 9c97b0f0-8745-4571-bfc3-8dceb677292a
  ;;; bytecomp.el ends here
--- 4114,4118 ----
  
  (run-hooks 'bytecomp-load-hook)
  
! ;; arch-tag: 9c97b0f0-8745-4571-bfc3-8dceb677292a
  ;;; bytecomp.el ends here