projects
/
elisp
/
wanderlust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update
[elisp/wanderlust.git]
/
elmo
/
elmo-localdir.el
diff --git
a/elmo/elmo-localdir.el
b/elmo/elmo-localdir.el
index
b85d9c9
..
3f3c8d4
100644
(file)
--- a/
elmo/elmo-localdir.el
+++ b/
elmo/elmo-localdir.el
@@
-91,8
+91,12
@@
'identity
(mapcar
'elmo-replace-string-as-filename
'identity
(mapcar
'elmo-replace-string-as-filename
- (split-string (elmo-localdir-folder-dir-name-internal folder)
- "/"))
+ (split-string
+ (let ((dir-name (elmo-localdir-folder-dir-name-internal folder)))
+ (if (file-name-absolute-p dir-name)
+ (expand-file-name dir-name)
+ dir-name))
+ "/"))
"/")
(expand-file-name ;;"localdir"
(symbol-name (elmo-folder-type-internal folder))
"/")
(expand-file-name ;;"localdir"
(symbol-name (elmo-folder-type-internal folder))
@@
-299,7
+303,7
@@
(let ((dir (elmo-localdir-folder-directory-internal folder)))
(if (not (file-directory-p dir))
(error "No such directory: %s" dir)
(let ((dir (elmo-localdir-folder-directory-internal folder)))
(if (not (file-directory-p dir))
(error "No such directory: %s" dir)
- (elmo-delete-directory dir t)
+ (elmo-delete-match-files dir "[0-9]+" t)
t)))
(luna-define-method elmo-folder-rename-internal ((folder elmo-localdir-folder)
t)))
(luna-define-method elmo-folder-rename-internal ((folder elmo-localdir-folder)
@@
-311,7
+315,7
@@
(error "No such directory: %s" old)
(if (file-exists-p new)
(error "Already exists directory: %s" new)
(error "No such directory: %s" old)
(if (file-exists-p new)
(error "Already exists directory: %s" new)
- (if (not (file-exists-p new-dir))
+ (if (not (file-directory-p new-dir))
(elmo-make-directory new-dir))
(rename-file old new)
t))))
(elmo-make-directory new-dir))
(rename-file old new)
t))))