diff options
| author | Tino Calancha | 2016-04-24 17:05:33 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2016-04-24 17:05:53 +0200 |
| commit | 0cd2e923dba8d8c7128b0c084ce6af22069e8db5 (patch) | |
| tree | fb436392153f4f79404dfdf973e58c10ca040d8b | |
| parent | 4f40f5f63aaf2948a7b99c3a2eed0e50b2aa3a47 (diff) | |
| download | emacs-0cd2e923dba8d8c7128b0c084ce6af22069e8db5.tar.gz emacs-0cd2e923dba8d8c7128b0c084ce6af22069e8db5.zip | |
Don't kill ~/ if it's the top level directory
* lisp/dired-aux.el (dired-kill-subdir): Don't kill ~/ if it's
the top level directory (bug#23017).
| -rw-r--r-- | lisp/dired-aux.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index d29abf3cab8..08db1877f1a 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el | |||
| @@ -2486,8 +2486,8 @@ Lower levels are unaffected." | |||
| 2486 | (cur-dir (dired-current-directory)) | 2486 | (cur-dir (dired-current-directory)) |
| 2487 | (cons (assoc-string cur-dir dired-switches-alist)) | 2487 | (cons (assoc-string cur-dir dired-switches-alist)) |
| 2488 | buffer-read-only) | 2488 | buffer-read-only) |
| 2489 | (if (equal cur-dir default-directory) | 2489 | (when (equal cur-dir (expand-file-name default-directory)) |
| 2490 | (error "Attempt to kill top level directory")) | 2490 | (error "Attempt to kill top level directory")) |
| 2491 | (prog1 | 2491 | (prog1 |
| 2492 | (if remember-marks (dired-remember-marks beg end)) | 2492 | (if remember-marks (dired-remember-marks beg end)) |
| 2493 | (delete-region beg end) | 2493 | (delete-region beg end) |