X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime.el;h=57d816cc4972b8bb5fc5a576fc99806723d21cb6;hb=41e4fd4242e2a1f959c312e74854025cbb9d0f80;hp=9ad5b36ea85fa3a53f6372e462cbf90c723bfdae;hpb=49f882ede642702d7d54feedf89f3fc828365ea5;p=elisp%2Fflim.git

diff --git a/mime.el b/mime.el
index 9ad5b36..57d816c 100644
--- a/mime.el
+++ b/mime.el
@@ -60,7 +60,7 @@ current-buffer, and return it.")
 (autoload 'mime-uri-parse-cid "mime-parse"
   "Parse STRING as cid URI.")
 
-(autoload 'mime-parse-buffer "mmbuffer"
+(autoload 'mime-parse-buffer "mime-parse"
   "Parse BUFFER as a MIME message.")
 
 )
@@ -69,7 +69,8 @@ current-buffer, and return it.")
 ;;;
 
 (defmacro mime-entity-send (entity message &rest args)
-  `(luna-send ,entity ',(intern (format "mime-%s" (eval message))) ,@args))
+  (` (luna-send (, entity)
+		'(, (intern (format "mime-%s" (eval message)))) (,@ args))))
 
 (defun mime-open-entity (type location)
   "Open an entity and return it.
@@ -143,34 +144,57 @@ If MESSAGE is specified, it is regarded as root entity."
   (null (mime-entity-parent entity message)))
 
 
-;;; @ Entity Buffer
+;;; @ Header buffer
 ;;;
 
-(luna-define-generic mime-entity-buffer (entity))
+(luna-define-generic mime-entity-header-buffer (entity))
 
-(make-obsolete
- 'mime-entity-buffer
- "use mime-entity-header-buffer or mime-entity-body-buffer instead.")
+(luna-define-generic mime-goto-header-start-point (entity)
+  "Set buffer and point to header-start-position of ENTITY.")
+
+(luna-define-generic mime-entity-header-start-point (entity)
+  "Return header-start-position of ENTITY.")
+
+(luna-define-generic mime-entity-header-end-point (entity)
+  "Return header-end-position of ENTITY.")
 
-(luna-define-generic mime-entity-header-buffer (entity))
+
+;;; @ Body buffer
+;;;
 
 (luna-define-generic mime-entity-body-buffer (entity))
 
-(luna-define-generic mime-entity-point-min (entity))
+(luna-define-generic mime-goto-body-start-point (entity)
+  "Set buffer and point to body-start-position of ENTITY.")
 
-(luna-define-generic mime-entity-point-max (entity))
+(luna-define-generic mime-goto-body-end-point (entity)
+  "Set buffer and point to body-end-position of ENTITY.")
+
+(luna-define-generic mime-entity-body-start-point (entity)
+  "Return body-start-position of ENTITY.")
+
+(define-obsolete-function-alias
+  'mime-entity-body-start 'mime-entity-body-start-point)
 
 (luna-define-generic mime-entity-body-end-point (entity)
-  "Set buffer and point to body-start-position of ENTITY.")
+  "Return body-end-position of ENTITY.")
 
 (define-obsolete-function-alias
   'mime-entity-body-end 'mime-entity-body-end-point)
 
-(luna-define-generic mime-goto-header-start-point (entity)
-  "Set buffer and point to header-start-position of ENTITY.")
 
-(luna-define-generic mime-goto-body-start-point (entity)
-  "Set buffer and point to body-start-position of ENTITY.")
+;;; @ Entity buffer (obsolete)
+;;;
+
+(luna-define-generic mime-entity-buffer (entity))
+(make-obsolete 'mime-entity-buffer
+ "use mime-entity-header-buffer or mime-entity-body-buffer instead.")
+
+(luna-define-generic mime-entity-point-min (entity))
+(make-obsolete 'mime-entity-point-min 'mime-entity-header-start-point)
+
+(luna-define-generic mime-entity-point-max (entity))
+(make-obsolete 'mime-entity-point-max 'mime-entity-body-end-point)
 
 
 ;;; @ Entity Header