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

[Richard M. Stallman]

Index: emacs/lisp/emacs-lisp/bytecomp.el
diff -c emacs/lisp/emacs-lisp/bytecomp.el:2.135 
emacs/lisp/emacs-lisp/bytecomp.el:2.136
*** emacs/lisp/emacs-lisp/bytecomp.el:2.135     Fri Jul  4 19:47:48 2003
--- emacs/lisp/emacs-lisp/bytecomp.el   Tue Aug  5 21:08:21 2003
***************
*** 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.
  
--- 10,16 ----
  
  ;;; This version incorporates changes up to version 2.10 of the
  ;;; Zawinski-Furuseth compiler.
! (defconst byte-compile-version "$Revision: 2.136 $")
  
  ;; This file is part of GNU Emacs.
  
***************
*** 351,356 ****
--- 351,359 ----
                      (const callargs) (const redefine)
                      (const obsolete) (const noruntime) (const cl-functions))))
  
+ (defvar byte-compile-not-obsolete-var nil
+   "If non-nil, this is a variable that shouldn't be reported as obsolete.")
+ 
  (defcustom byte-compile-generate-call-tree nil
    "*Non-nil means collect call-graph information when compiling.
  This records functions were called and from where.
***************
*** 982,988 ****
  ;; Also log the current function and file if not already done.
  (defun byte-compile-log-warning (string &optional fill level)
    (let ((warning-prefix-function 'byte-compile-warning-prefix)
!       (warning-group-format "")
        (warning-fill-prefix (if fill "    ")))
      (display-warning 'bytecomp string level "*Compile-Log*")))
  
--- 985,991 ----
  ;; Also log the current function and file if not already done.
  (defun byte-compile-log-warning (string &optional fill level)
    (let ((warning-prefix-function 'byte-compile-warning-prefix)
!       (warning-type-format "")
        (warning-fill-prefix (if fill "    ")))
      (display-warning 'bytecomp string level "*Compile-Log*")))
  
***************
*** 2705,2711 ****
         (if (symbolp var) "constant" "nonvariable")
         (prin1-to-string var))
      (if (and (get var 'byte-obsolete-variable)
!            (memq 'obsolete byte-compile-warnings))
        (let* ((ob (get var 'byte-obsolete-variable))
               (when (cdr ob)))
          (byte-compile-warn "%s is an obsolete variable%s; %s" var
--- 2708,2715 ----
         (if (symbolp var) "constant" "nonvariable")
         (prin1-to-string var))
      (if (and (get var 'byte-obsolete-variable)
!            (memq 'obsolete byte-compile-warnings)
!            (not (eq var byte-compile-not-obsolete-var)))
        (let* ((ob (get var 'byte-obsolete-variable))
               (when (cdr ob)))
          (byte-compile-warn "%s is an obsolete variable%s; %s" var
***************
*** 3608,3620 ****
                             fun var string))
        `(put ',var 'variable-documentation ,string))
        (if (cddr form)         ; `value' provided
!         (if (eq fun 'defconst)
!             ;; `defconst' sets `var' unconditionally.
!             (let ((tmp (make-symbol "defconst-tmp-var")))
!               `(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)))
--- 3612,3625 ----
                             fun var string))
        `(put ',var 'variable-documentation ,string))
        (if (cddr form)         ; `value' provided
!         (let ((byte-compile-not-obsolete-var var))
!           (if (eq fun 'defconst)
!               ;; `defconst' sets `var' unconditionally.
!               (let ((tmp (make-symbol "defconst-tmp-var")))
!                 `(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)))