X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fgnus-start.el;h=442ed529791287b75ffc7f78a4ef1cfa9c7ae3ff;hp=cfedeb16a4b9d6bc9a167790c070e8e256e129d2;hb=992509a3574f9add376cc480db9bb5656285bd5b;hpb=1092348813c6b3aee4ef30ae7f25998a2469430e

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index cfedeb16a..442ed5297 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -763,8 +763,8 @@ prompt the user for the name of an NNTP server to use."
     ;; Add "native" to gnus-predefined-server-alist just to have a
     ;; name for the native select method.
     (when gnus-select-method
-      (push (cons "native" gnus-select-method)
-	    gnus-predefined-server-alist))
+      (add-to-list 'gnus-predefined-server-alist
+		   (cons "native" gnus-select-method)))
 
     (if gnus-agent
 	(gnus-agentize))
@@ -1369,11 +1369,6 @@ for new groups, and subscribe the new groups as zombies."
 	(funcall gnus-group-change-level-function
 		 group level oldlevel previous)))))
 
-(defun gnus-kill-newsgroup (newsgroup)
-  "Obsolete function.  Kills a newsgroup."
-  (gnus-group-change-level
-   (gnus-group-entry newsgroup) gnus-level-killed))
-
 (defun gnus-check-bogus-newsgroups (&optional confirm)
   "Remove bogus newsgroups.
 If CONFIRM is non-nil, the user has to confirm the deletion of every
@@ -1504,8 +1499,6 @@ backend check whether the group actually exists."
 	     ;; Return the new active info.
 	     active)))))
 
-(defvar gnus-propagate-marks)		; gnus-sum
-
 (defun gnus-get-unread-articles-in-group (info active &optional update)
   (when (and info active)
     ;; Allow the backend to update the info in the group.
@@ -1515,13 +1508,6 @@ backend check whether the group actually exists."
 			      (gnus-info-group info)))))
       (gnus-activate-group (gnus-info-group info) nil t))
 
-    ;; Allow backends to update marks,
-    (when gnus-propagate-marks
-      (let ((method (inline (gnus-find-method-for-group
-			     (gnus-info-group info)))))
-	(when (gnus-check-backend-function 'request-marks (car method))
-	  (gnus-request-marks info method))))
-
     (let* ((range (gnus-info-read info))
 	   (num 0))
 
@@ -2230,7 +2216,7 @@ backend check whether the group actually exists."
 	     (gnus-online method)
 	     (gnus-agent-method-p method))
 	(progn
-	  (gnus-agent-save-active method)
+	  (gnus-agent-save-active method t)
 	  (gnus-active-to-gnus-format method hashtb nil real-active))
 
       (goto-char (point-min))
@@ -2306,13 +2292,21 @@ If FORCE is non-nil, the .newsrc file is read."
       (gnus-convert-old-newsrc)
       (gnus-clean-old-newsrc))))
 
-(defun gnus-clean-old-newsrc ()
+(defun gnus-clean-old-newsrc (&optional force)
   (when gnus-newsrc-file-version
-    (when (< (gnus-continuum-version gnus-newsrc-file-version)
-	     (gnus-continuum-version "Ma Gnus v0.02"))
+    ;; Remove totally bogus `unexists' entries.  The name is
+    ;; `unexist'.
+    (dolist (info (cdr gnus-newsrc-alist))
+      (let ((exist (assoc 'unexists (gnus-info-marks info))))
+	(when exist
+	  (gnus-info-set-marks
+	   info (delete exist (gnus-info-marks info))))))
+    (when (or force
+	      (< (gnus-continuum-version gnus-newsrc-file-version)
+		 (gnus-continuum-version "Ma Gnus v0.03")))
       ;; Remove old `exist' marks from old nnimap groups.
       (dolist (info (cdr gnus-newsrc-alist))
-	(let ((exist (assoc 'exist (gnus-info-marks info))))
+	(let ((exist (assoc 'unexist (gnus-info-marks info))))
 	  (when exist
 	    (gnus-info-set-marks
 	     info (delete exist (gnus-info-marks info)))))))))
@@ -2454,7 +2448,9 @@ If FORCE is non-nil, the .newsrc file is read."
 	(when gnus-newsrc-assoc
 	  (setq gnus-newsrc-alist gnus-newsrc-assoc))))
     (dolist (elem gnus-newsrc-alist)
-      (setcar elem (mm-string-as-unibyte (car elem))))
+      ;; Protect against broken .newsrc.el files.
+      (when (car elem)
+	(setcar elem (mm-string-as-unibyte (car elem)))))
     (gnus-make-hashtable-from-newsrc-alist)
     (when (file-newer-than-file-p file ding-file)
       ;; Old format quick file