From: yamaoka <yamaoka>
Date: Fri, 1 Sep 2000 10:53:59 +0000 (+0000)
Subject: Synch with Gnus.
X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~121
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c6116b47f3afbb1d36ff7be93b93ba052df6d050;p=elisp%2Fgnus.git-

Synch with Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e33455d..6aa825b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-01  Simon Josefsson  <simon@josefsson.org>
+
+	* nnimap.el (nnimap-retrieve-headers-from-file): Ignore errors.
+
+	* imap.el (imap-parse-flag-list): Hack.
+
 2000-08-29  Dave Love  <fx@gnu.org>
 
 	* gnus-mlspl.el (gnus-group-split-fancy): Eschew mapcon.
diff --git a/lisp/imap.el b/lisp/imap.el
index 26aa54b..da60d3f 100644
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -2169,6 +2169,10 @@ Return nil if no complete line has arrived."
 	pos)
     (while (setq pos (string-match "\\\\" str (and pos (+ 2 pos))))
       (setq str (replace-match "\\\\" nil t str)))
+    ;; xxx ugly. rewrite not to use `read' at all.
+    (when (= (length (symbol-name (read "A?A"))) 1)
+      (while (setq pos (string-match "\\?" str (and pos (+ 2 pos))))
+	(setq str (replace-match "\\?" nil t str))))
     (mapcar 'symbol-name (read str))))
 
 ;;   envelope        = "(" env-date SP env-subject SP env-from SP env-sender SP
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 5e9b62e..e628681 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -54,6 +54,7 @@
 ;;     .newsrc.eld)
 ;;   o What about Gnus's article editing, can we support it?  NO!
 ;;   o Use \Draft to support the draft group??
+;;   o Duplicate suppression
 
 ;;; Code:
 
@@ -460,13 +461,11 @@ If EXAMINE is non-nil the group is selected read-only."
       (when (file-exists-p nov)
 	(nnheader-insert-file-contents nov)
 	(set-buffer-modified-p nil)
-	(let ((min (progn (goto-char (point-min))
-			  (when (not (eobp))
-			    (read (current-buffer)))))
-	      (max (progn (goto-char (point-max))
-			  (forward-line -1)
-			  (when (not (bobp))
-			    (read (current-buffer))))))
+	(let ((min (ignore-errors (goto-char (point-min))
+				  (read (current-buffer))))
+	      (max (ignore-errors (goto-char (point-max))
+				  (forward-line -1)
+				  (read (current-buffer)))))
 	  (if (and (numberp min) (numberp max))
 	      (cons min max)
 	    ;; junk, remove it, it's saved later