From 1653438384f8854e53d7d5a2ef855f5ceafc1b0c Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Wed, 1 Nov 2000 01:55:56 +0000
Subject: [PATCH] Synch with `t-gnus-6_14'.

---
 ChangeLog          |    9 +++++++++
 lisp/gnus-start.el |   46 ++++++++++++++++++++++++++--------------------
 lisp/gnus-vers.el  |    2 +-
 lisp/gnus.el       |    2 +-
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c1ec1e9..1c22c99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-11-01  Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* lisp/gnus-vers.el (gnus-revision-number): Increment to 06.
+
+	* lisp/gnus.el (gnus-product-variable-file-list): Check for
+	`emacs-version' in the file "cache" as well.
+	* lisp/gnus-start.el (gnus-product-read-variable-file-1): Make it
+	talkative.
+
 2000-10-31  Katsumi Yamaoka <yamaoka@jpl.org>
 
 	* lisp/dgnushack.el: Bind `:key-type' and `:value-type' for old
diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index c4df151..a536302 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -2071,26 +2071,32 @@ The backup file \".newsrc.eld_\" will be created before re-reading."
 
 (defun gnus-product-read-variable-file-1 (file checking-methods coding
 					       &rest variables)
-  (let (gnus-product-file-version method file-ver)
-    (if (or (condition-case err
-		(let ((coding-system-for-read coding)
-		      (input-coding-system coding))
-		  (load (expand-file-name file gnus-product-directory) t t t)
-		  nil)
-	      (error (message "%s" err)))
-	    (and (assq 'emacs-version checking-methods)
-		 (not (string= emacs-version
-			       (cdr (assq 'emacs-version
-					  gnus-product-file-version)))))
-	    (and (setq method (assq 'product-version checking-methods))
-		 (or (not (setq file-ver
-				(cdr (assq 'product-version
-					   gnus-product-file-version))))
-		     (< (product-version-compare file-ver (cadr method)) 0))))
-	(while variables
-	  (set (car variables) nil)
-	  (gnus-product-variable-touch (car variables))
-	  (setq variables (cdr variables))))))
+  (let (error gnus-product-file-version method file-ver)
+    (when (or
+	   (condition-case err
+	       (let ((coding-system-for-read coding)
+		     (input-coding-system coding))
+		 (load (expand-file-name file gnus-product-directory) t nil t)
+		 nil)
+	     (error
+	      (message "%s" err)
+	      (setq error t)))
+	   (and (assq 'emacs-version checking-methods)
+		(not (string= emacs-version
+			      (cdr (assq 'emacs-version
+					 gnus-product-file-version)))))
+	   (and (setq method (assq 'product-version checking-methods))
+		(or (not (setq file-ver
+			       (cdr (assq 'product-version
+					  gnus-product-file-version))))
+		    (< (product-version-compare file-ver (cadr method)) 0))))
+      (unless error
+	(message "\"%s\" seems to have mismatched contents, updating..."
+		 file))
+      (while variables
+	(set (car variables) nil)
+	(gnus-product-variable-touch (car variables))
+	(setq variables (cdr variables))))))
 
 ;; Parse the old-style quick startup file
 (defun gnus-read-old-newsrc-el-file (file)
diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el
index 19997ff..8a1b2f7 100644
--- a/lisp/gnus-vers.el
+++ b/lisp/gnus-vers.el
@@ -31,7 +31,7 @@
 (require 'product)
 (provide 'gnus-vers)
 
-(defconst gnus-revision-number "05"
+(defconst gnus-revision-number "06"
   "Revision number for this version of gnus.")
 
 ;; Product information of this gnus.
diff --git a/lisp/gnus.el b/lisp/gnus.el
index a768887..68fa965 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1653,7 +1653,7 @@ This variable can be nil, gnus or gnus-ja."
     `(("strict-cache" ((product-version ,version) (emacs-version))
        binary
        gnus-format-specs-compiled)
-      ("cache" ((product-version ,version))
+      ("cache" ((product-version ,version) (emacs-version))
        ,codesys
        gnus-format-specs)))
   "Gnus variables are saved in the produce depend quick startup files.")
-- 
1.7.10.4