rearrangement.

diff --git a/mime-view.el b/mime-view.el
index b61669d..17bc11d 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -6,7 +6,7 @@
 ;; Created: 1994/7/13
 ;;     Renamed: 1994/8/31 from tm-body.el
 ;;     Renamed: 1997/02/19 from tm-view.el
-;; Version: $Revision: 0.113 $
+;; Version: $Revision: 0.114 $
 ;; Keywords: MIME, multimedia, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -39,7 +39,7 @@
 ;;;
 
 (defconst mime-view-RCS-ID
-  "$Id: mime-view.el,v 0.113 1997-09-21 17:40:42 morioka Exp $")
+  "$Id: mime-view.el,v 0.114 1997-09-25 13:03:50 morioka Exp $")
 
 (defconst mime-view-version
   `,(get-version-string mime-view-RCS-ID))
@@ -197,34 +197,6 @@ Each elements are regexp of field-name.")
     ))
 
 
-;;; @@ predicate functions
-;;;
-
-(defun mime-view-header-visible-p (rcnum cinfo)
-  "Return non-nil if header of current entity is visible."
-  (or (null rcnum)
-      (member (mime-entity-info-type/subtype
-              (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo))
-             mime-view-childrens-header-showing-Content-Type-list)
-      ))
-
-(defun mime-view-body-visible-p (rcnum cinfo media-type media-subtype)
-  (let ((ctype (if media-type
-                  (if media-subtype
-                      (format "%s/%s" media-type media-subtype)
-                    (symbol-name media-type)
-                    ))))
-    (and (member ctype mime-view-visible-media-type-list)
-        (if (and (eq media-type 'application)
-                 (eq media-subtype 'octet-stream))
-            (let ((ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo)))
-              (member (mime-entity-info-encoding ccinfo)
-                      '(nil "7bit" "8bit"))
-              )
-          t))
-    ))
-
-
 ;;; @@ entity button
 ;;;
 
@@ -695,6 +667,34 @@ The compressed face will be piped to this command.")
     dest))
 
 
+;;; @@ predicate functions
+;;;
+
+(defun mime-view-header-visible-p (rcnum cinfo)
+  "Return non-nil if header of current entity is visible."
+  (or (null rcnum)
+      (member (mime-entity-info-type/subtype
+              (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo))
+             mime-view-childrens-header-showing-Content-Type-list)
+      ))
+
+(defun mime-view-body-visible-p (rcnum cinfo media-type media-subtype)
+  (let ((ctype (if media-type
+                  (if media-subtype
+                      (format "%s/%s" media-type media-subtype)
+                    (symbol-name media-type)
+                    ))))
+    (and (member ctype mime-view-visible-media-type-list)
+        (if (and (eq media-type 'application)
+                 (eq media-subtype 'octet-stream))
+            (let ((ccinfo (mime-article/rcnum-to-cinfo rcnum cinfo)))
+              (member (mime-entity-info-encoding ccinfo)
+                      '(nil "7bit" "8bit"))
+              )
+          t))
+    ))
+
+
 ;;; @ MIME viewer mode
 ;;;