[the following changes fix a bug where `define-minor-mode' didn't

correctly generate :require clauses for defcustoms in compiled files]

(byte-compile-last-logged-file):
  New variable.
(byte-compile-log-file, byte-compile-log-1):
  Don't set `byte-compile-current-file' to nil.
  Instead set `byte-compile-last-logged-file' to it.
  Test whether byte-compile-current-file equals byte-compile-last-logged-file
    instead of whether its nil.

2 files changed, 24 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f3799e8eb5..c6af44f9d3c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2000-10-23  Miles Bader  <miles@lsi.nec.co.jp>
+
+	[the following changes fix a bug where `define-minor-mode' didn't
+	correctly generate :require clauses for defcustoms in compiled files]
+	* emacs-lisp/bytecomp.el (byte-compile-last-logged-file): New variable.
+	(byte-compile-log-file, byte-compile-log-1): Don't set
+	`byte-compile-current-file' to nil.  Instead set
+	`byte-compile-last-logged-file' to it.  Test whether
+	byte-compile-current-file equals byte-compile-last-logged-file
+	instead of whether its nil.
+
 2000-10-23  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* textmodes/refill.el: Fix var names in doc.
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 800df042a78..bd8cd8c88af 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -10,7 +10,7 @@
 
 ;;; This version incorporates changes up to version 2.10 of the
 ;;; Zawinski-Furuseth compiler.
-(defconst byte-compile-version "$Revision: 2.76 $")
+(defconst byte-compile-version "$Revision: 2.77 $")
 
 ;; This file is part of GNU Emacs.
 
@@ -811,12 +811,15 @@ Each function's symbol gets marked with the `byte-compile-noruntime' property."
 			 args)))))))
 
 (defconst byte-compile-last-warned-form nil)
+(defconst byte-compile-last-logged-file nil)
 
 ;; Log a message STRING in *Compile-Log*.
 ;; Also log the current function and file if not already done.
 (defun byte-compile-log-1 (string &optional fill)
   (cond (noninteractive
-	 (if (or byte-compile-current-file
+	 (if (or (and byte-compile-current-file
+		      (not (equal byte-compile-current-file
+				  byte-compile-last-logged-file)))
 		 (and byte-compile-last-warned-form
 		      (not (eq byte-compile-current-form
 			       byte-compile-last-warned-form))))
@@ -833,7 +836,9 @@ Each function's symbol gets marked with the `byte-compile-noruntime' property."
 	 (save-excursion
 	   (set-buffer (get-buffer-create "*Compile-Log*"))
 	   (goto-char (point-max))
-	   (cond ((or byte-compile-current-file
+	   (cond ((or (and byte-compile-current-file
+			   (not (equal byte-compile-current-file
+				       byte-compile-last-logged-file)))
 		      (and byte-compile-last-warned-form
 			   (not (eq byte-compile-current-form
 				    byte-compile-last-warned-form))))
@@ -855,13 +860,15 @@ Each function's symbol gets marked with the `byte-compile-noruntime' property."
 		     (fill-column 78))
 		 (fill-paragraph nil)))
 	   )))
-  (setq byte-compile-current-file nil
+  (setq byte-compile-last-logged-file byte-compile-current-file
 	byte-compile-last-warned-form byte-compile-current-form))
 
 ;; Log the start of a file in *Compile-Log*, and mark it as done.
 ;; But do nothing in batch mode.
 (defun byte-compile-log-file ()
-  (and byte-compile-current-file (not noninteractive)
+  (and byte-compile-current-file
+       (not (equal byte-compile-current-file byte-compile-last-logged-file))
+       (not noninteractive)
        (save-excursion
 	 (set-buffer (get-buffer-create "*Compile-Log*"))
 	 (goto-char (point-max))
@@ -870,7 +877,7 @@ Each function's symbol gets marked with the `byte-compile-noruntime' property."
 		     (concat "file " byte-compile-current-file)
 		   (concat "buffer " (buffer-name byte-compile-current-file)))
 		 " at " (current-time-string) "\n")
-	 (setq byte-compile-current-file nil))))
+	 (setq byte-compile-last-logged-file byte-compile-current-file))))
 
 (defun byte-compile-warn (format &rest args)
   (setq format (apply 'format format args))