* elmo-pipe.el (elmo-pipe-spec-src, elmo-pipe-spec-dst): Moved to elmo-util.el.

* elmo-util.el (elmo-pipe-spec-src, elmo-pipe-spec-dst): Moved from elmo-pipe.el

* elmo-archive.el (elmo-archive-call-process): Enclose with static-if.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index a2b4d45..832c4c9 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,14 @@
 2001-01-12  Yuuichi Teranishi  <teranisi@gohome.org>
 
+       * elmo-pipe.el (elmo-pipe-spec-src, elmo-pipe-spec-dst):
+       Moved to elmo-util.el.
+
+       * elmo-util.el (elmo-pipe-spec-src, elmo-pipe-spec-dst):
+       Moved from elmo-pipe.el
+
+       * elmo-archive.el (elmo-archive-call-process): Enclose with
+       static-if.
+
        * elmo-imap4.el (elmo-imap4-read-msg): Use "BODY[]" instead of
        "RFC822" (because RFC822.PEEK is obsolete).
        (Adviced by IMAI Takeshi <imai@on.rim.or.jp>)

diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el
index d81e748..478eabb 100644 (file)
--- a/elmo/elmo-archive.el
+++ b/elmo/elmo-archive.el
@@ -29,8 +29,8 @@
 ;;; Commentary:
 ;; 
 ;; TODO:
-;; [\e$B%\%=\e(B] append-msgs() \e$B$,M_$7$$!J$1$I\e(B multi-refile \e$BIT2D!K!#\e(B
-;; Info-Zip \e$B@lMQ%(!<%8%'%s%H$rMQ$$$?F|K\8l8!:w!J\e(BOS/2 \e$B@lMQ!K!#\e(B
+;; [¥Ü¥½] append-msgs() ¤¬Íߤ·¤¤¡Ê¤±¤É multi-refile ÉԲġˡ£
+;; Info-Zip ÀìÍÑ¥¨¡¼¥¸¥§¥ó¥È¤òÍѤ¤¤¿ÆüËܸ측º÷¡ÊOS/2 ÀìÍÑ¡Ë¡£
 
 ;;; Code:
 ;; 
@@ -217,7 +217,7 @@
   (` (cdr (assq (, type)
                elmo-archive-file-regexp-alist))))
 
-(if (boundp 'NEMACS)
+(static-if (boundp 'NEMACS)
     (defsubst elmo-archive-call-process (prog args &optional output)
       (apply 'call-process prog nil output nil args)
       0)

diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index 372ba2a..f17f9f9 100644 (file)
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -31,12 +31,6 @@
 
 (require 'elmo-msgdb)
 
-(defsubst elmo-pipe-spec-src (spec)
-  (nth 1 spec))
-
-(defsubst elmo-pipe-spec-dst (spec)
-  (nth 2 spec))
-
 (defalias 'elmo-pipe-msgdb-create 'elmo-pipe-msgdb-create-as-numlist)
 
 (defun elmo-pipe-msgdb-create-as-numlist (spec numlist new-mark already-mark

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index fb8af11..a9600aa 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -474,6 +474,12 @@ File content is encoded with MIME-CHARSET."
          (elmo-match-string 2 folder)
          (elmo-match-string 3 folder))))
 
+(defsubst elmo-pipe-spec-src (spec)
+  (nth 1 spec))
+
+(defsubst elmo-pipe-spec-dst (spec)
+  (nth 2 spec))
+
 (defun elmo-folder-get-spec (folder)
   "Return spec of FOLDER."
   (let ((type (elmo-folder-get-type folder)))