From: shuhei-k <shuhei-k>
Date: Sun, 8 Mar 1998 19:33:48 +0000 (+0000)
Subject: Sync up with gnus-5.6.2.
X-Git-Tag: gnus-6_7-tomo-199811302358~123
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=0fa1618fd9a1ff14f48dd60781566153f03f0c40;p=elisp%2Fgnus.git-

Sync up with gnus-5.6.2.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b2a1b3..5187062 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,34 @@
+Sun Mar  8 14:05:25 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+
+	* gnus.el: Gnus v5.6.2 is released.
+
+Sun Mar  8 00:35:09 1998  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+	* gnus-picon.el (gnus-get-buffer-name): Look in the assoc for the
+	variable. 
+
+	* nntp.el (nntp-wait-for): Check more for dead connections.
+
+	* gnus-eform.el (gnus-edit-form-buffer): Moved back here.
+
+	* gnus-win.el (gnus-window-to-buffer-helper): Return nil when
+	buffers don't exist.
+
+	* nndraft.el (nndraft-request-restore-buffer): Remove Xref header,
+	not Xrefs.
+
+Sun Mar  8 00:00:04 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+
+	* gnus.el: Gnus v5.6.1 is released.
+
+Sat Mar  7 22:15:46 1998  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+	* gnus.el (gnus-edit-form-buffer): Moved here.
+
+	* gnus-agent.el (gnus-agent-expire-old): Removed.
+	(gnus-agent-expire-directory): Ditto.
+	(gnus-agent-expire-group): Even more ditto.
+
 Sat Mar  7 21:59:18 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
 	* gnus.el: Quassia Gnus v0.37 is released.
diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 864cc1b..397986f 100644
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -1285,94 +1285,6 @@ The following commands are available:
 	  (gnus-delete-line))
 	(gnus-agent-save-history)
 	(gnus-agent-close-history)))))
-  
-(defun gnus-agent-expire-old ()
-  "Expire all old articles."
-  (interactive)
-  (let ((methods gnus-agent-covered-methods)
-	(alist (cdr gnus-newsrc-alist))
-	gnus-command-method ofiles info method file group)
-    (while (setq gnus-command-method (pop methods))
-      (setq ofiles (nconc ofiles (gnus-agent-expire-directory
-				  (gnus-agent-directory)))))
-    (while (setq info (pop alist))
-      (when (and (gnus-agent-method-p
-		  (setq gnus-command-method
-			(gnus-find-method-for-group
-			 (setq group (gnus-info-group info)))))
-		 (member
-		  (setq file
-			(concat
-			 (gnus-agent-directory)
-			 (gnus-agent-group-path group) "/.overview"))
-		  ofiles))
-	(setq ofiles (delete file ofiles))
-	(gnus-agent-expire-group file group)))
-    (while ofiles
-      (gnus-agent-expire-group (pop ofiles)))))
-
-(defun gnus-agent-expire-directory (dir)
-  "Expire all groups in DIR recursively."
-  (when (file-directory-p dir)
-    (let ((files (directory-files dir t))
-	  file ofiles)
-      (while (setq file (pop files))
-	(cond
-	 ((member (file-name-nondirectory file) '("." ".."))
-	  ;; Do nothing.
-	  )
-	 ((file-directory-p file)
-	  ;; Recurse.
-	  (setq ofiles (nconc ofiles (gnus-agent-expire-directory file))))
-	 ((string-match "\\.overview$" file)
-	  ;; Expire group.
-	  (push file ofiles))))
-      ofiles)))
-
-(defun gnus-agent-expire-group (overview &optional group)
-  "Expire articles in OVERVIEW."
-  (gnus-message 5 "Expiring %s..." overview)
-  (let ((odate (- (gnus-time-to-day (current-time)) 4))
-	(dir (file-name-directory overview))
-	(info (when group (gnus-get-info group)))
-	headers article file point unreads)
-    (gnus-agent-load-alist nil dir)
-    (when info
-      (setq unreads
-	    (nconc
-	     (gnus-list-of-unread-articles group)
-	     (gnus-uncompress-range
-	      (cdr (assq 'tick (gnus-info-marks info))))
-	     (gnus-uncompress-range
-	      (cdr (assq 'dormant (gnus-info-marks info)))))))
-    (nnheader-temp-write overview
-      (insert-file-contents overview)
-      (goto-char (point-min))
-      (while (not (eobp))
-	(setq point (point))
-	(condition-case ()
-	    (setq headers (inline (nnheader-parse-nov)))
-	  (error
-	   (goto-char point)
-	   (gnus-delete-line)
-	   (setq headers nil)))
-	(when headers
-	  (if (memq (setq article (mail-header-number headers)) unreads)
-	      (forward-line 1)
-	    (if (not (< (inline
-			  (gnus-time-to-day
-			   (inline (nnmail-date-to-time
-				    (mail-header-date headers)))))
-			odate))
-		(forward-line 1)	      
-	      (gnus-delete-line)
-	      (setq gnus-agent-article-alist
-		    (delq (assq article gnus-agent-article-alist)
-			  gnus-agent-article-alist))
-	      (when (file-exists-p
-		     (setq file (concat dir (number-to-string article))))
-		(delete-file file))))))
-      (gnus-agent-save-alist nil nil nil dir))))
 
 ;;;###autoload
 (defun gnus-agent-batch ()
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index db74b92..6e6802a 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -2608,8 +2608,6 @@ the thread are to be displayed."
       (and (consp elem)			; Has to be a cons.
 	   (consp (cdr elem))		; The cdr has to be a list.
 	   (symbolp (car elem))		; Has to be a symbol in there.
-	   (not (memq (car elem)
-		      '(quit-config to-address to-list to-group)))
 	   (ignore-errors		; So we set it.
 	     (make-local-variable (car elem))
 	     (set (car elem) (eval (nth 1 elem))))))))