X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fnnimap.el;h=e0bb5a0e134a148847e3f061d2a242f1a63d2c83;hp=c5b77dbef4addc93cc5a6d8d21970b6cbec86206;hb=4598d7eb56ad42593c8aee7189d3b31e6c476344;hpb=23d41b7075b8f21f4d03df819ab9ca3dcf21f0a0

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index c5b77dbef..e0bb5a0e1 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -208,8 +208,7 @@ textual parts.")
 	  (delete-region (+ (match-beginning 0) 2) (point))
 	  (setq string (buffer-substring (point) (+ (point) size)))
 	  (delete-region (point) (+ (point) size))
-	  (insert (format "%S" (subst-char-in-string
-				?\n ?\s string))))
+	  (insert (format "%S" (mm-subst-char-in-string ?\n ?\s string))))
 	(beginning-of-line)
 	(setq article
 	      (and (re-search-forward "UID \\([0-9]+\\)" (line-end-position)
@@ -290,7 +289,7 @@ textual parts.")
 
 (defun nnimap-make-process-buffer (buffer)
   (with-current-buffer
-      (generate-new-buffer (format "*nnimap %s %s %s*"
+      (generate-new-buffer (format " *nnimap %s %s %s*"
 				   nnimap-address nnimap-server-port
 				   (gnus-buffer-exists-p buffer)))
     (mm-disable-multibyte)
@@ -1231,7 +1230,8 @@ textual parts.")
       (setf (nnimap-group nnimap-object) nil)
       (setf (nnimap-initial-resync nnimap-object) 0)
       (let ((qresyncp (nnimap-capability "QRESYNC"))
-	    params groups sequences active uidvalidity modseq group)
+	    params groups sequences active uidvalidity modseq group
+	    unexist)
 	;; Go through the infos and gather the data needed to know
 	;; what and how to request the data.
 	(dolist (info infos)
@@ -1239,13 +1239,15 @@ textual parts.")
 		group (nnimap-decode-gnus-group
 		       (gnus-group-real-name (gnus-info-group info)))
 		active (cdr (assq 'active params))
+		unexist (assq 'unexist (gnus-info-marks info))
 		uidvalidity (cdr (assq 'uidvalidity params))
 		modseq (cdr (assq 'modseq params)))
 	  (setf (nnimap-examined nnimap-object) group)
 	  (if (and qresyncp
 		   uidvalidity
 		   active
-		   modseq)
+		   modseq
+		   unexist)
 	      (push
 	       (list (nnimap-send-command "EXAMINE %S (%s (%s %s))"
 					  (utf7-encode group t)
@@ -1264,11 +1266,10 @@ textual parts.")
 		     ;; is read-only or not.
 		     "SELECT"))
 		  start)
-	      (if (and active uidvalidity)
+	      (if (and active uidvalidity unexist)
 		  ;; Fetch the last 100 flags.
 		  (setq start (max 1 (- (cdr active) 100)))
-		(setf (nnimap-initial-resync nnimap-object)
-		      (1+ (nnimap-initial-resync nnimap-object)))
+		(incf (nnimap-initial-resync nnimap-object))
 		(setq start 1))
 	      (push (list (nnimap-send-command "%s %S" command
 					       (utf7-encode group t))
@@ -1445,6 +1446,20 @@ textual parts.")
 		      (setq new-marks (gnus-range-nconcat old-marks new-marks)))
 		    (when new-marks
 		      (push (cons (car type) new-marks) marks)))))
+	      ;; Keep track of non-existing articles.
+	      (let* ((old-unexists (assq 'unexist marks))
+		     (unexists
+		      (if completep
+			  (gnus-range-difference
+			   (gnus-active group)
+			   (gnus-compress-sequence existing))
+			(gnus-add-to-range
+			 (cdr old-unexists)
+			 (gnus-list-range-difference
+			  existing (gnus-active group))))))
+		(if old-unexists
+		    (setcdr old-unexists unexists)
+		  (push (cons 'unexist unexists) marks)))
 	      (gnus-info-set-marks info marks t))))
 	;; Tell Gnus whether there are any \Recent messages in any of
 	;; the groups.
@@ -1488,6 +1503,14 @@ textual parts.")
 		      (gnus-sorted-complement existing new-marks))))
 	(when ticks
 	  (push (cons (car type) ticks) marks)))
+      (gnus-info-set-marks info marks t))
+    ;; Add vanished to the list of unexisting articles.
+    (when vanished
+      (let* ((old-unexists (assq 'unexist marks))
+	     (unexists (gnus-range-add (cdr old-unexists) vanished)))
+	(if old-unexists
+	    (setcdr old-unexists unexists)
+	  (push (cons 'unexist unexists) marks)))
       (gnus-info-set-marks info marks t))))
 
 (defun nnimap-imap-ranges-to-gnus-ranges (irange)
@@ -1540,7 +1563,8 @@ textual parts.")
 
 (defun nnimap-parse-flags (sequences)
   (goto-char (point-min))
-  ;; Change \Delete etc to %Delete, so that the reader can read it.
+  ;; Change \Delete etc to %Delete, so that the Emacs Lisp reader can
+  ;; read it.
   (subst-char-in-region (point-min) (point-max)
 			?\\ ?% t)
   ;; Remove any MODSEQ entries in the buffer, because they may contain
@@ -1611,7 +1635,9 @@ textual parts.")
 			     vanished highestmodseq)
 		       articles)
 		groups)
-	  (goto-char end)
+	  (if (eq flag-sequence 'qresync)
+	      (goto-char end)
+	    (setq end (point)))
 	  (setq articles nil))))
     groups))
 
@@ -1694,13 +1720,17 @@ textual parts.")
     (nnimap-wait-for-response nnimap-sequence))
   nnimap-sequence)
 
+(defvar nnimap-record-commands nil
+  "If non-nil, log commands to the \"*imap log*\" buffer.")
+
 (defun nnimap-log-command (command)
-  (with-current-buffer (get-buffer-create "*imap log*")
-    (goto-char (point-max))
-    (insert (format-time-string "%H:%M:%S") " "
-	    (if nnimap-inhibit-logging
-		"(inhibited)\n"
-	      command)))
+  (when nnimap-record-commands
+    (with-current-buffer (get-buffer-create "*imap log*")
+      (goto-char (point-max))
+      (insert (format-time-string "%H:%M:%S") " "
+	      (if nnimap-inhibit-logging
+		  "(inhibited)\n"
+		command))))
   command)
 
 (defun nnimap-command (&rest args)
@@ -1755,8 +1785,11 @@ textual parts.")
 	       7 "nnimap read %dk from %s%s" (/ (buffer-size) 1000)
 	       nnimap-address
 	       (if (not (zerop (nnimap-initial-resync nnimap-object)))
-		   (format " (initial sync of %d groups; please wait)"
-			   (nnimap-initial-resync nnimap-object))
+		   (format " (initial sync of %d group%s; please wait)"
+			   (nnimap-initial-resync nnimap-object)
+			   (if (= (nnimap-initial-resync nnimap-object) 1)
+			       ""
+			     "s"))
 		 "")))
 	    (nnheader-accept-process-output process)
 	    (goto-char (point-max)))