Rename ` mime-article/' -> `mime-raw-'.

diff --git a/mime-pgp.el b/mime-pgp.el
index 3fe6f0d..012865a 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -48,7 +48,7 @@
 ;;; It is based on draft-kazu-pgp-mime-00.txt
 
 (defun mime-method-for-application/pgp (beg end cal)
-  (let* ((cnum (mime-article/point-content-number beg))
+  (let* ((cnum (mime-raw-point-content-number beg))
         (p-win (or (get-buffer-window mime-preview-buffer)
                    (get-largest-window)))
         (new-name (format "%s-%s" (buffer-name) cnum))
@@ -118,8 +118,8 @@
 
 (defun mime-method-to-verify-multipart/signed (beg end cal)
   "Internal method to check multipart/signed."
-  (let* ((rcnum (reverse (mime-article/point-content-number beg)))
-        (oinfo (mime-article/rcnum-to-cinfo (cons '1 rcnum)
+  (let* ((rcnum (reverse (mime-raw-point-content-number beg)))
+        (oinfo (mime-raw-rcnum-to-cinfo (cons '1 rcnum)
                                             mime-raw-entity-info))
         )
     (mime-playback-entity oinfo (cdr (assq 'mode cal)))
@@ -175,7 +175,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 (defun mime-method-to-verify-application/pgp-signature (beg end cal)
   "Internal method to check PGP/MIME signature."
   (let* ((encoding (cdr (assq 'encoding cal)))
-        (cnum (mime-article/point-content-number beg))
+        (cnum (mime-raw-point-content-number beg))
         (rcnum (reverse cnum))
         (rmcnum (cdr rcnum))
         (knum (car rcnum))
@@ -183,7 +183,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
                   (1- knum)
                 (1+ knum)))
         (raw-buf (current-buffer))
-        (oinfo (mime-article/rcnum-to-cinfo (cons onum rmcnum)
+        (oinfo (mime-raw-rcnum-to-cinfo (cons onum rmcnum)
                                             mime-raw-entity-info))
         kbuf
         (basename (expand-file-name "tm" mime-temp-directory))
@@ -261,14 +261,14 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 ;;; It is based on RFC 2015.
 
 (defun mime-method-to-decrypt-application/pgp-encrypted (beg end cal)
-  (let* ((cnum (mime-article/point-content-number beg))
+  (let* ((cnum (mime-raw-point-content-number beg))
         (rcnum (reverse cnum))
         (rmcnum (cdr rcnum))
         (knum (car rcnum))
         (onum (if (> knum 0)
                   (1- knum)
                 (1+ knum)))
-        (oinfo (mime-article/rcnum-to-cinfo (cons onum rmcnum)
+        (oinfo (mime-raw-rcnum-to-cinfo (cons onum rmcnum)
                                             mime-raw-entity-info))
         (obeg (mime-entity-info-point-min oinfo))
         (oend (mime-entity-info-point-max oinfo))
@@ -287,7 +287,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 ;;; It is based on RFC 2015.
 
 (defun mime-method-to-add-application/pgp-keys (beg end cal)
-  (let* ((cnum (mime-article/point-content-number beg))
+  (let* ((cnum (mime-raw-point-content-number beg))
         (new-name (format "%s-%s" (buffer-name) cnum))
         (encoding (cdr (assq 'encoding cal)))
         str)

diff --git a/mime-play.el b/mime-play.el
index 92344b9..f41c0d5 100644 (file)
--- a/mime-play.el
+++ b/mime-play.el
@@ -121,7 +121,7 @@ If MODE is specified, play as it.  Default MODE is \"play\"."
       (narrow-to-region beg end)
       (goto-char beg)
       (let ((method (cdr (assoc 'method cal)))
-           (name (mime-article/get-filename cal))
+           (name (mime-raw-get-filename cal))
            )
        (if method
            (let ((file (make-temp-name
@@ -227,8 +227,8 @@ window.")
   (concat (regexp-* mime-view-file-name-char-regexp)
          "\\(\\." mime-view-file-name-char-regexp "+\\)*"))
 
-(defun mime-article/get-original-filename (param &optional encoding)
-  (or (mime-article/get-uu-filename param encoding)
+(defun mime-raw-get-original-filename (param &optional encoding)
+  (or (mime-raw-get-uu-filename param encoding)
       (let (ret)
        (or (if (or (and (setq ret (mime/Content-Disposition))
                         (setq ret (assoc "filename" (cdr ret)))
@@ -248,8 +248,8 @@ window.")
            ))
       ))
 
-(defun mime-article/get-filename (param)
-  (replace-as-filename (mime-article/get-original-filename param))
+(defun mime-raw-get-filename (param)
+  (replace-as-filename (mime-raw-get-original-filename param))
   )
 
 
@@ -261,7 +261,7 @@ window.")
   (let* ((name
          (save-restriction
            (narrow-to-region beg end)
-           (mime-article/get-filename cal)
+           (mime-raw-get-filename cal)
            ))
         (encoding (cdr (assq 'encoding cal)))
         (filename
@@ -302,7 +302,7 @@ It is registered to variable `mime-view-quitting-method-alist'."
     ))
 
 (defun mime-method-to-display-message/rfc822 (beg end cal)
-  (let* ((cnum (mime-article/point-content-number beg))
+  (let* ((cnum (mime-raw-point-content-number beg))
         (new-name (format "%s-%s" (buffer-name) cnum))
         (mother mime-preview-buffer)
         (text-decoder
@@ -326,7 +326,7 @@ It is registered to variable `mime-view-quitting-method-alist'."
 ;;; @ message/partial
 ;;;
 
-(defvar mime-article/coding-system-alist
+(defvar mime-raw-coding-system-alist
   (list '(mh-show-mode . no-conversion)
        (cons t (mime-charset-to-coding-system default-mime-charset))
        ))
@@ -334,8 +334,8 @@ It is registered to variable `mime-view-quitting-method-alist'."
 (defun mime-article::write-region (start end file)
   (let ((coding-system-for-write
         (cdr
-         (or (assq major-mode mime-article/coding-system-alist)
-             (assq t mime-article/coding-system-alist)
+         (or (assq major-mode mime-raw-coding-system-alist)
+             (assq t mime-raw-coding-system-alist)
              ))))
     (write-region start end file)
     ))
@@ -459,13 +459,13 @@ It is registered to variable `mime-view-quitting-method-alist'."
 ;;; @ message/external-body
 ;;;
 
-(defvar mime-article/dired-function
+(defvar mime-raw-dired-function
   (if mime/use-multi-frame
       (function dired-other-frame)
-    (function mime-article/dired-function-for-one-frame)
+    (function mime-raw-dired-function-for-one-frame)
     ))
 
-(defun mime-article/dired-function-for-one-frame (dir)
+(defun mime-raw-dired-function-for-one-frame (dir)
   (let ((win (or (get-buffer-window mime-preview-buffer)
                 (get-largest-window))))
     (select-window win)
@@ -480,7 +480,7 @@ It is registered to variable `mime-view-quitting-method-alist'."
         (pathname (concat "/anonymous@" site ":" directory))
         )
     (message (concat "Accessing " (expand-file-name name pathname) "..."))
-    (funcall mime-article/dired-function pathname)
+    (funcall mime-raw-dired-function pathname)
     (goto-char (point-min))
     (search-forward name)
     ))
@@ -491,7 +491,7 @@ It is registered to variable `mime-view-quitting-method-alist'."
 
 (defun mime-method-to-display-caesar (start end cal)
   "Internal method for mime-view to display ROT13-47-48 message."
-  (let* ((cnum (mime-article/point-content-number start))
+  (let* ((cnum (mime-raw-point-content-number start))
         (new-name (format "%s-%s" (buffer-name) cnum))
         (the-buf (current-buffer))
         (mother mime-preview-buffer)

diff --git a/mime-view.el b/mime-view.el
index a0ff3d8..d2f43cf 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -218,7 +218,7 @@ Please redefine this function if you want to change default setting."
           (or (eq media-subtype 'x-selection)
               (and (eq media-subtype 'octet-stream)
                    (let ((entity-info
-                          (mime-article/rcnum-to-cinfo (cdr rcnum) cinfo)))
+                          (mime-raw-rcnum-to-cinfo (cdr rcnum) cinfo)))
                      (and (eq (mime-entity-info-media-type entity-info)
                               'multipart)
                           (eq (mime-entity-info-media-subtype entity-info)
@@ -468,7 +468,7 @@ The compressed face will be piped to this command.")
       (narrow-to-region beg end)
       (setq subj
            (eword-decode-string
-            (mime-article/get-subject params encoding)))
+            (mime-raw-get-subject params encoding)))
       )
     (set-buffer obuf)
     (setq nb (point))
@@ -546,7 +546,7 @@ The compressed face will be piped to this command.")
                     (function mime-preview-play-current-entity))
     ))
 
-(defun mime-article/get-uu-filename (param &optional encoding)
+(defun mime-raw-get-uu-filename (param &optional encoding)
   (if (member (or encoding
                  (cdr (assq 'encoding param))
                  )
@@ -559,7 +559,7 @@ The compressed face will be piped to this command.")
            ""))
     ))
 
-(defun mime-article/get-subject (param &optional encoding)
+(defun mime-raw-get-subject (param &optional encoding)
   (or (std11-find-field-body '("Content-Description" "Subject"))
       (let (ret)
        (if (or (and (setq ret (mime/Content-Disposition))
@@ -570,14 +570,14 @@ The compressed face will be piped to this command.")
                )
            (std11-strip-quoted-string (cdr ret))
          ))
-      (mime-article/get-uu-filename param encoding)
+      (mime-raw-get-uu-filename param encoding)
       ""))
 
 
 ;;; @ entity information
 ;;;
 
-(defun mime-article/point-content-number (p &optional cinfo)
+(defun mime-raw-point-content-number (p &optional cinfo)
   (or cinfo
       (setq cinfo mime-raw-entity-info)
       )
@@ -590,7 +590,7 @@ The compressed face will be piped to this command.")
              (catch 'tag
                (while c
                  (setq co (car c))
-                 (setq ret (mime-article/point-content-number p co))
+                 (setq ret (mime-raw-point-content-number p co))
                  (cond ((eq ret t) (throw 'tag (list sn)))
                        (ret (throw 'tag (cons sn ret)))
                        )
@@ -599,11 +599,11 @@ The compressed face will be piped to this command.")
                  )))
            t))))
 
-(defsubst mime-article/rcnum-to-cinfo (rnum &optional cinfo)
-  (mime-article/cnum-to-cinfo (reverse rnum) cinfo)
+(defsubst mime-raw-rcnum-to-cinfo (rnum &optional cinfo)
+  (mime-raw-cnum-to-cinfo (reverse rnum) cinfo)
   )
 
-(defun mime-article/cnum-to-cinfo (cn &optional cinfo)
+(defun mime-raw-cnum-to-cinfo (cn &optional cinfo)
   (or cinfo
       (setq cinfo mime-raw-entity-info)
       )
@@ -614,7 +614,7 @@ The compressed face will be piped to this command.")
          cinfo
        (let ((rc (nth sn (mime-entity-info-children cinfo))))
          (if rc
-             (mime-article/cnum-to-cinfo (cdr cn) rc)
+             (mime-raw-cnum-to-cinfo (cdr cn) rc)
            ))
        ))))
 
@@ -639,7 +639,7 @@ The compressed face will be piped to this command.")
   "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-raw-rcnum-to-cinfo (cdr rcnum) cinfo))
              mime-view-childrens-header-showing-Content-Type-list)
       ))
 
@@ -652,7 +652,7 @@ The compressed face will be piped to this command.")
     (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)))
+            (let ((ccinfo (mime-raw-rcnum-to-cinfo rcnum cinfo)))
               (member (mime-entity-info-encoding ccinfo)
                       '(nil "7bit" "8bit"))
               )
@@ -962,7 +962,7 @@ It calls following-method selected from variable
                     (setq str
                           (save-excursion
                             (set-buffer a-buf)
-                            (setq ci (mime-article/rcnum-to-cinfo rcnum))
+                            (setq ci (mime-raw-rcnum-to-cinfo rcnum))
                             (save-restriction
                               (narrow-to-region
                                (mime-entity-info-point-min ci)
@@ -1037,7 +1037,7 @@ If there is no upper entity, call function `mime-preview-quit'."
     (while (null (setq cinfo (get-text-property (point) 'mime-view-cinfo)))
       (backward-char)
       )
-    (let ((r (mime-article/rcnum-to-cinfo
+    (let ((r (mime-raw-rcnum-to-cinfo
              (cdr (mime-entity-info-rnum cinfo))
              (get-text-property 1 'mime-view-cinfo)))
          point)