diff options
| author | Juri Linkov | 2013-12-17 23:39:15 +0200 |
|---|---|---|
| committer | Juri Linkov | 2013-12-17 23:39:15 +0200 |
| commit | 33dd8e954466afacbcceb0ecc85d1ac4ed05ec27 (patch) | |
| tree | f7ea1141e34ce85b00bb420b5ef0e2f0238f5610 | |
| parent | 7a409b30053cf0c48ff5de7c5d9b408493df1054 (diff) | |
| download | emacs-33dd8e954466afacbcceb0ecc85d1ac4ed05ec27.tar.gz emacs-33dd8e954466afacbcceb0ecc85d1ac4ed05ec27.zip | |
* lisp/arc-mode.el (archive-extract-by-file): Check if directory exists
before deletion to not show irrelevant errors if it doesn't exist.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/arc-mode.el | 6 |
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 @@ | |||
| 1 | 2013-12-17 Juri Linkov <juri@jurta.org> | 1 | 2013-12-17 Juri Linkov <juri@jurta.org> |
| 2 | 2 | ||
| 3 | * arc-mode.el (archive-extract-by-file): Check if directory exists | ||
| 4 | before deletion to not show irrelevant errors if it doesn't exist. | ||
| 5 | |||
| 6 | 2013-12-17 Juri Linkov <juri@jurta.org> | ||
| 7 | |||
| 3 | * menu-bar.el (menu-bar-tools-menu): Add `browse-web'. | 8 | * menu-bar.el (menu-bar-tools-menu): Add `browse-web'. |
| 4 | (Bug#14751) | 9 | (Bug#14751) |
| 5 | 10 | ||
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." | |||
| 1164 | (delete-file (expand-file-name name dest))) | 1164 | (delete-file (expand-file-name name dest))) |
| 1165 | (while (file-name-directory name) | 1165 | (while (file-name-directory name) |
| 1166 | (setq name (directory-file-name (file-name-directory name))) | 1166 | (setq name (directory-file-name (file-name-directory name))) |
| 1167 | (delete-directory (expand-file-name name dest))) | 1167 | (when (file-directory-p (expand-file-name name dest)) |
| 1168 | (delete-directory dest)))) | 1168 | (delete-directory (expand-file-name name dest)))) |
| 1169 | (when (file-directory-p dest) | ||
| 1170 | (delete-directory dest))))) | ||
| 1169 | 1171 | ||
| 1170 | (defun archive-extract-other-window () | 1172 | (defun archive-extract-other-window () |
| 1171 | "In archive mode, find this member in another window." | 1173 | "In archive mode, find this member in another window." |