From: Michael Olson <mwolson@gnu.org>
To: ding@gnus.org
Subject: [PATCH v2] Fix edge cases with no data being returned and Courier eccentricity.
Date: Tue, 23 Dec 2008 10:39:50 -0800 [thread overview]
Message-ID: <87lju6ag7d.fsf@grepfind.mwolson.org> (raw)
* 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.
---
This applies to Emacs CVS HEAD.
This version backs up one char in order to appease nnimap-forward.
lisp/gnus/nnimap.el | 9 +++++----
lisp/net/imap.el | 4 +++-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index e0bb5ad..a38d354 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -620,7 +620,7 @@ If EXAMINE is non-nil the group is selected read-only."
;; 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 @@ function is generally only called when Gnus is shutting down."
(erase-buffer)
(let ((data (imap-fetch article part prop nil
nnimap-server-buffer)))
- (insert (nnimap-demule (if detail
- (nth 2 (car data))
- data))))
+ (when data
+ (insert (nnimap-demule (if detail
+ (nth 2 (car data))
+ data)))))
(nnheader-ms-strip-cr)
(gnus-message
10 "nnimap: Fetching (part of) article %d from %s...done"
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index 6726bfd..85afffc 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -2493,7 +2493,9 @@ Return nil if no complete line has arrived."
(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)
--
1.5.6.3
--
| Michael Olson | FSF Associate Member #652 |
| http://mwolson.org/ | Hobbies: Lisp, HCoop |
| Projects: Emacs, Muse, ERC, EMMS, ErBot, DVC, Planner |
`-------------------------------------------------------'
next reply other threads:[~2008-12-23 18:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-23 18:39 Michael Olson [this message]
2008-12-28 4:29 ` Michael Olson
2008-12-29 21:31 ` Ted Zlatanov
2009-01-03 23:12 ` Michael Olson
2009-01-03 23:56 ` Reiner Steib
2009-01-04 0:03 ` Michael Olson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lju6ag7d.fsf@grepfind.mwolson.org \
--to=mwolson@gnu.org \
--cc=ding@gnus.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).