Change order of `mime-entity'.

diff --git a/mime-parse.el b/mime-parse.el
index 213563c..f9757d1 100644 (file)
--- a/mime-parse.el
+++ b/mime-parse.el
@@ -181,20 +181,19 @@ If is is not found, return DEFAULT-ENCODING."
 ;;;
 
 (defsubst make-mime-entity (buffer
-                           node-id
                            header-start header-end body-start body-end
+                           &optional node-id
                            content-type content-disposition
                            encoding children)
-  (vector buffer
-         node-id header-start header-end body-start body-end
-         content-type content-disposition encoding children))
+  (vector buffer header-start header-end body-start body-end
+         node-id content-type content-disposition encoding children))
 
 (defsubst mime-entity-buffer (entity)              (aref entity 0))
-(defsubst mime-entity-node-id (entity)             (aref entity 1))
-(defsubst mime-entity-header-start (entity)        (aref entity 2))
-(defsubst mime-entity-header-end (entity)          (aref entity 3))
-(defsubst mime-entity-body-start (entity)          (aref entity 4))
-(defsubst mime-entity-body-end (entity)            (aref entity 5))
+(defsubst mime-entity-header-start (entity)        (aref entity 1))
+(defsubst mime-entity-header-end (entity)          (aref entity 2))
+(defsubst mime-entity-body-start (entity)          (aref entity 3))
+(defsubst mime-entity-body-end (entity)            (aref entity 4))
+(defsubst mime-entity-node-id (entity)             (aref entity 5))
 (defsubst mime-entity-content-type (entity)        (aref entity 6))
 (defsubst mime-entity-content-disposition (entity) (aref entity 7))
 (defsubst mime-entity-encoding (entity)            (aref entity 8))
@@ -262,9 +261,9 @@ If is is not found, return DEFAULT-ENCODING."
        )
       (setq children (cons ret children))
       )
-    (make-mime-entity (current-buffer) node-id
+    (make-mime-entity (current-buffer)
                      header-start header-end body-start body-end
-                     content-type content-disposition encoding
+                     node-id content-type content-disposition encoding
                      (nreverse children))
     ))
 
@@ -315,8 +314,9 @@ mime-{parse|read}-Content-Type."
                (memq (mime-content-type-subtype content-type)
                      '(rfc822 news)
                      ))
-           (make-mime-entity (current-buffer) node-id
+           (make-mime-entity (current-buffer)
                             header-start header-end body-start body-end
+                            node-id
                             content-type content-disposition encoding
                             (save-restriction
                               (narrow-to-region body-start body-end)
@@ -325,8 +325,9 @@ mime-{parse|read}-Content-Type."
                               ))
           )
          (t 
-           (make-mime-entity (current-buffer) node-id
+           (make-mime-entity (current-buffer)
                             header-start header-end body-start body-end
+                            node-id
                             content-type content-disposition encoding nil)
           ))
     ))