From 5360f5573613cbb954db115436ce46d68fdfb6bc Mon Sep 17 00:00:00 2001 From: teranisi Date: Fri, 3 Aug 2001 04:00:55 +0000 Subject: [PATCH] 2001-08-03 Yuuichi Teranishi * wl-fldmgr.el (wl-fldmgr-rename): Fixed second argument. 2001-08-03 YAMASHITA Junji * elmo-localdir.el (elmo-folder-rename-internal): Fixed typo. 2001-08-03 Yuuichi Teranishi * elmo-archive.el (elmo-archive-get-archive-name): Fixed logic. (Advised by YAMASHITA Junji .) --- elmo/ChangeLog | 9 ++++++++ elmo/elmo-archive.el | 59 +++++++++++++++++++++++-------------------------- elmo/elmo-localdir.el | 2 +- wl/ChangeLog | 4 ++++ wl/wl-fldmgr.el | 2 +- 5 files changed, 43 insertions(+), 33 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index c61e542..4a83e95 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,12 @@ +2001-08-03 YAMASHITA Junji + + * elmo-localdir.el (elmo-folder-rename-internal): Fixed typo. + +2001-08-03 Yuuichi Teranishi + + * elmo-archive.el (elmo-archive-get-archive-name): Fixed logic. + (Advised by YAMASHITA Junji .) + 2001-08-02 Yuuichi Teranishi * elmo-shimbun.el (elmo-folder-msgdb-create): Bind unbound diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el index 5209923..7149b33 100644 --- a/elmo/elmo-archive.el +++ b/elmo/elmo-archive.el @@ -357,37 +357,34 @@ TYPE specifies the archiver's symbol." folder) suffix) elmo-archive-folder-path)) - (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 - (concat elmo-archive-basename suffix) - dir) - ;; for full-path specification. - (if (find-file-name-handler dir 'copy-file) ; ange-ftp, efs - (progn - (setq filename (expand-file-name - (concat elmo-archive-basename suffix) - (setq dbdir - (elmo-folder-msgdb-path folder)))) - (if (file-directory-p dbdir) - (); ok. - (if (file-exists-p dbdir) - (error "File %s already exists" dbdir) - (elmo-make-directory dbdir))) - (if (not (file-exists-p filename)) - (copy-file - (if (file-directory-p dir) - (expand-file-name - (concat elmo-archive-basename suffix) - dir) - dir) - filename)) - filename) + (if (string-match + "^\\(ange-ftp\\|efs\\)-" + (symbol-name (find-file-name-handler dir 'copy-file))) + ;; ange-ftp, efs + (progn + (setq filename (expand-file-name + (concat elmo-archive-basename suffix) + (setq dbdir + (elmo-folder-msgdb-path folder)))) + (if (file-directory-p dbdir) + (); ok. + (if (file-exists-p dbdir) + (error "File %s already exists" dbdir) + (elmo-make-directory dbdir))) + (if (not (file-exists-p filename)) + (copy-file + (if (file-directory-p dir) + (expand-file-name + (concat elmo-archive-basename suffix) + dir) + dir) + filename)) + filename) + (if (or (not (file-exists-p dir) + (file-directory-p dir))) + (expand-file-name + (concat elmo-archive-basename suffix) + dir) dir))))) (luna-define-method elmo-folder-exists-p ((folder elmo-archive-folder)) diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el index 9ccc48e..1384a38 100644 --- a/elmo/elmo-localdir.el +++ b/elmo/elmo-localdir.el @@ -302,7 +302,7 @@ (luna-define-method elmo-folder-rename-internal ((folder elmo-localdir-folder) new-folder) (let* ((old (elmo-localdir-folder-directory-internal folder)) - (new (elmo-localdir-folder-directory-internal folder)) + (new (elmo-localdir-folder-directory-internal new-folder)) (new-dir (directory-file-name (file-name-directory new)))) (if (not (file-directory-p old)) (error "No such directory: %s" old) diff --git a/wl/ChangeLog b/wl/ChangeLog index ac7e627..3c870b4 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,7 @@ +2001-08-03 Yuuichi Teranishi + + * wl-fldmgr.el (wl-fldmgr-rename): Fixed second argument. + 2001-08-02 Yuuichi Teranishi * wl-folder.el (wl-folder): redisplay after folder insertion. diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el index f63811e..d64b06b 100644 --- a/wl/wl-fldmgr.el +++ b/wl/wl-fldmgr.el @@ -908,7 +908,7 @@ return value is diffs '(-new -unread -all)." (wl-folder-get-elmo-folder new-folder)))) (error "Already exists folder: %s" new-folder)) (elmo-folder-rename (wl-folder-get-elmo-folder old-folder) - (wl-folder-get-elmo-folder new-folder)) + new-folder) (wl-folder-set-entity-info new-folder (wl-folder-get-entity-info old-folder)) -- 1.7.10.4