[Emacs-diffs] trunk r115575: * lisp/arc-mode.el (archive-extract-by-file): Check if directory exists

[Juri Linkov]

------------------------------------------------------------
revno: 115575
revision-id: address@hidden
parent: address@hidden
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-12-17 23:39:15 +0200
message:
  * lisp/arc-mode.el (archive-extract-by-file): Check if directory exists
  before deletion to not show irrelevant errors if it doesn't exist.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/arc-mode.el               arcmode.el-20091113204419-o5vbwnq5f7feedwu-877

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-17 21:17:05 +0000
+++ b/lisp/ChangeLog    2013-12-17 21:39:15 +0000
@@ -1,5 +1,10 @@
 2013-12-17  Juri Linkov  <address@hidden>
 
+       * 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  <address@hidden>
+
        * menu-bar.el (menu-bar-tools-menu): Add `browse-web'.
        (Bug#14751)
 

=== modified file 'lisp/arc-mode.el'
--- a/lisp/arc-mode.el  2013-11-13 20:40:12 +0000
+++ b/lisp/arc-mode.el  2013-12-17 21:39:15 +0000
@@ -1164,8 +1164,10 @@
          (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."