summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/arc-mode.el6
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 55a99103c93..902330baaa9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
2013-12-17 Juri Linkov <juri@jurta.org>
+ * arc-mode.el (archive-extract-by-file): Check if directory exists
+ before deletion to not show irrelevant errors if it doesn't exist.
+
+2013-12-17 Juri Linkov <juri@jurta.org>
+
* menu-bar.el (menu-bar-tools-menu): Add `browse-web'.
(Bug#14751)
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 57a030bbf44..4683532c4a4 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -1164,8 +1164,10 @@ using `make-temp-file', and the generated name is returned."
(delete-file (expand-file-name name dest)))
(while (file-name-directory name)
(setq name (directory-file-name (file-name-directory name)))
- (delete-directory (expand-file-name name dest)))
- (delete-directory dest))))
+ (when (file-directory-p (expand-file-name name dest))
+ (delete-directory (expand-file-name name dest))))
+ (when (file-directory-p dest)
+ (delete-directory dest)))))
(defun archive-extract-other-window ()
"In archive mode, find this member in another window."