[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.134 
emacs/lisp/emacs-lisp/bytecomp.el:2.135
*** emacs/lisp/emacs-lisp/bytecomp.el:2.134     Wed May 28 07:26:45 2003
--- emacs/lisp/emacs-lisp/bytecomp.el   Fri Jul  4 19:47:48 2003
***************
*** 1,6 ****
  ;;; bytecomp.el --- compilation of Lisp code into byte code
  
! ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1998, 2000, 2001, 2002
  ;;   Free Software Foundation, Inc.
  
  ;; Author: Jamie Zawinski <address@hidden>
--- 1,6 ----
  ;;; bytecomp.el --- compilation of Lisp code into byte code
  
! ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1998, 2000, 2001, 2002, 2003
  ;;   Free Software Foundation, Inc.
  
  ;; Author: Jamie Zawinski <address@hidden>
***************
*** 10,16 ****
  
  ;;; This version incorporates changes up to version 2.10 of the
  ;;; Zawinski-Furuseth compiler.
! (defconst byte-compile-version "$Revision: 2.134 $")
  
  ;; This file is part of GNU Emacs.
  
--- 10,16 ----
  
  ;;; This version incorporates changes up to version 2.10 of the
  ;;; Zawinski-Furuseth compiler.
! (defconst byte-compile-version "$Revision: 2.135 $")
  
  ;; This file is part of GNU Emacs.
  
***************
*** 3614,3620 ****
                `(funcall '(lambda (,tmp) (defconst ,var ,tmp))
                          ,value))
            ;; `defvar' sets `var' only when unbound.
!           `(if (not (boundp ',var)) (setq ,var ,value)))
        (when (eq fun 'defconst)
          ;; This will signal an appropriate error at runtime.
          `(eval ',form)))
--- 3614,3620 ----
                `(funcall '(lambda (,tmp) (defconst ,var ,tmp))
                          ,value))
            ;; `defvar' sets `var' only when unbound.
!           `(if (not (default-boundp ',var)) (setq-default ,var ,value)))
        (when (eq fun 'defconst)
          ;; This will signal an appropriate error at runtime.
          `(eval ',form)))
***************
*** 3984,3991 ****
  
  ;;; report metering (see the hacks in bytecode.c)
  
  (defun byte-compile-report-ops ()
-   (defvar byte-code-meter)
    (with-output-to-temp-buffer "*Meter*"
      (set-buffer "*Meter*")
      (let ((i 0) n op off)
--- 3984,3991 ----
  
  ;;; report metering (see the hacks in bytecode.c)
  
+ (defvar byte-code-meter)
  (defun byte-compile-report-ops ()
    (with-output-to-temp-buffer "*Meter*"
      (set-buffer "*Meter*")
      (let ((i 0) n op off)