2000-07-26 Takaaki MORIYAMA <taka@airlab.cs.ritsumei.ac.jp>

	* elmo-archive.el (elmo-archive-get-archive-name): Fixed problem
	when dired is used on XEmacs.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 6a38333..9147160 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-26  Takaaki MORIYAMA <taka@airlab.cs.ritsumei.ac.jp>
+
+       * elmo-archive.el (elmo-archive-get-archive-name): Fixed problem
+       when dired is used on XEmacs.
+
 2000-07-25  OKAZAKI Tetsurou  <okazaki@be.to>
 
        * elmo-imap4.el (elmo-imap4-process-folder-list): Use `nconc'
@@ -12,7 +17,7 @@
        Use `cons' instead of `append' for updating the connection cache.
        * elmo-nntp.el (elmo-nntp-get-connection): Likewise.
        * elmo-imap4.el (elmo-imap4-get-connection): Likewise.
-       
+
 2000-07-22  OKAZAKI Tetsurou  <okazaki@be.to>
 
        * elmo-imap4.el (elmo-imap4-read-bytes): Advance

diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el
index bd3163f..a16829f 100644 (file)
--- a/elmo/elmo-archive.el
+++ b/elmo/elmo-archive.el
@@ -307,7 +307,10 @@ TYPE specifies the archiver's symbol."
          (expand-file-name
           (concat folder suffix)
           elmo-archive-folder-path))
-      (if (and (not (find-file-name-handler dir 'copy-file)) ; dir is local.
+      (if (and (let ((handler (find-file-name-handler dir 'copy-file))) ; dir is local.
+                (or (not handler)
+                    (if (featurep 'xemacs)
+                        (eq handler 'dired-handler-fn))))
               (or (not (file-exists-p dir))
                   (file-directory-p dir)))
          (expand-file-name