diff lisp/mail/pmailmm.el @ 97808:1aab9bdd9355

Resolve all byte compiler warnings and enable IMAP/movemail support.
author Paul Reilly <pmr@pajato.com>
date Fri, 29 Aug 2008 04:27:46 +0000
parents 1b1837ac37e2
children f4a921de2099
line wrap: on
line diff
--- a/lisp/mail/pmailmm.el	Fri Aug 29 01:06:42 2008 +0000
+++ b/lisp/mail/pmailmm.el	Fri Aug 29 04:27:46 2008 +0000
@@ -39,6 +39,9 @@
 
 ;;; Code:
 
+;; For ...
+(require 'pmail)
+
 ;;; Variables
 
 (defcustom pmail-mime-media-type-handlers-alist
@@ -190,10 +193,11 @@
   ;;    of the preceding part.
   ;; We currently don't handle that.
   (let ((boundary (cdr (assq 'boundary content-type)))
-	beg next)
+	beg end next)
     (unless boundary
-      (error "No boundary defined" content-type content-disposition
-	     content-transfer-encoding))
+      (pmail-mm-get-boundary-error-message
+       "No boundary defined" content-type content-disposition
+       content-transfer-encoding))
     (setq boundary (concat "\n--" boundary))
     ;; Hide the body before the first bodypart
     (goto-char (point-min))
@@ -216,8 +220,9 @@
 	    ((looking-at "[ \t]*\n")
 	     (setq next (copy-marker (match-end 0))))
 	    (t
-	     (error "Malformed boundary" content-type
-		    content-disposition content-transfer-encoding)))
+	     (pmail-mm-get-boundary-error-message
+	      "Malformed boundary" content-type content-disposition
+	      content-transfer-encoding)))
       (delete-region end next)
       ;; Handle the part.
       (save-match-data
@@ -396,6 +401,11 @@
       (pmail-mime-show t))
     (view-buffer buf)))
 
+(defun pmail-mm-get-boundary-error-message (message type disposition encoding)
+  "Return MESSAGE with more information on the main mime components."
+  (error "%s; type: %s; disposition: %s; encoding: %s"
+	 message type disposition encoding))
+
 (provide 'pmailmm)
 
 ;; arch-tag: 3f2c5e5d-1aef-4512-bc20-fd737c9d5dd9