[gnus git] branch master updated: =2= (nnimap-convert-partial-article): Protect against zero-length body parts. ; Fix typo in last checkin.
Lars Magne Ingebrigtsen <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 9a6f050343be1e99fdacb2328edf6f89e788abbf (commit)
via 38d15dba4d58d1e95625c618dc0598b37b118518 (commit)
from d9418f8743d26df6253803ccb2ff8cdc88e8934f (commit)
- Log -----------------------------------------------------------------
commit 9a6f050343be1e99fdacb2328edf6f89e788abbf
Author: Lars Magne Ingebrigtsen <[email protected]>
Date: Tue Jan 11 20:28:06 2011 +0100
(nnimap-convert-partial-article): Protect against zero-length body parts.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 668350a..af97fb7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2011-01-11 Lars Magne Ingebrigtsen <[email protected]>
+ * nnimap.el (nnimap-convert-partial-article): Protect against
+ zero-length body parts.
+
* mm-decode.el (mm-preferred-alternative-precedence): Discourage
showing empty parts.
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 51fa532..0c71170 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -582,7 +582,7 @@ textual parts.")
;; Collect all the body parts.
(while (looking-at ".*BODY\\[\\([.0-9]+\\)\\]")
(setq id (match-string 1)
- bytes (nnimap-get-length))
+ bytes (or (nnimap-get-length) 0))
(beginning-of-line)
(delete-region (point) (progn (forward-line 1) (point)))
(push (list id (buffer-substring (point) (+ (point) bytes)))
commit 38d15dba4d58d1e95625c618dc0598b37b118518
Author: Lars Magne Ingebrigtsen <[email protected]>
Date: Tue Jan 11 20:22:07 2011 +0100
Fix typo in last checkin.
diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index ab3b378..6275534 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -1370,7 +1370,7 @@ Use CMD as the process."
(setq handles (reverse handles))
(dolist (disc (reverse mm-discouraged-alternatives))
(dolist (handle (copy-sequence handles))
- (when (string-match disc (mm-handle-media-type elem))
+ (when (string-match disc (mm-handle-media-type handle))
(setq handles (nconc (delete handle handles) (list handle))))))
;; Remove empty parts.
(dolist (handle (copy-sequence handles))
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 3 +++
lisp/mm-decode.el | 2 +-
lisp/nnimap.el | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project