[Emacs-diffs] emacs/lisp gnus/nnimap.el net/imap.el

[Michael W. Olson]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael W. Olson <mwolson>      09/01/03 23:05:42

Modified files:
        lisp/gnus      : nnimap.el 
        lisp/net       : imap.el 

Log message:
        Gnus: Fix edge cases with no data being returned and Courier 
eccentricity.
        
        * lisp/gnus/nnimap.el (nnimap-retrieve-headers-progress): Handle edge
          case where `headers' is nil.  This can occur if the IMAP server does
          not have permissions to read messages from a folder, but can write new
          messages to the folder.
          (nnimap-request-article-part): Do not insert `data' if it is nil.
        
        * lisp/net/imap.el (imap-parse-fetch): Courier can insert spurious blank
          characters which will confuse `read', so skip past them.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/nnimap.el?cvsroot=emacs&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/imap.el?cvsroot=emacs&r1=1.13&r2=1.14

Patches:
Index: gnus/nnimap.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/nnimap.el,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- gnus/nnimap.el      2 Dec 2008 22:29:15 -0000       1.51
+++ gnus/nnimap.el      3 Jan 2009 23:05:42 -0000       1.52
@@ -620,7 +620,7 @@
        ;; to make it more clear.
        (mm-with-unibyte-buffer
         (buffer-disable-undo)
-        (insert headers)
+        (when headers (insert headers))
         (let ((head (nnheader-parse-naked-head uid)))
           (mail-header-set-number head uid)
           (mail-header-set-chars head chars)
@@ -950,9 +950,10 @@
              (erase-buffer)
              (let ((data (imap-fetch article part prop nil
                                      nnimap-server-buffer)))
+               (when data
                (insert (nnimap-demule (if detail
                                           (nth 2 (car data))
-                                        data))))
+                                          data)))))
              (nnheader-ms-strip-cr)
              (gnus-message
               10 "nnimap: Fetching (part of) article %d from %s...done"

Index: net/imap.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/imap.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- net/imap.el 6 May 2008 07:31:46 -0000       1.13
+++ net/imap.el 3 Jan 2009 23:05:42 -0000       1.14
@@ -2493,7 +2493,9 @@
   (when (eq (char-after) ?\()
     (let (uid flags envelope internaldate rfc822 rfc822header rfc822text
              rfc822size body bodydetail bodystructure flags-empty)
-      (while (not (eq (char-after) ?\)))
+      (while (let ((moved (skip-chars-forward " \t")))
+              (prog1 (not (eq (char-after) ?\)))
+                (unless (= moved 0) (backward-char))))
        (imap-forward)
        (let ((token (read (current-buffer))))
          (imap-forward)