diff options
| author | Lars Ingebrigtsen | 2020-09-04 15:50:48 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2020-09-04 15:50:48 +0200 |
| commit | 9e5fd29bede00905d7ff95ea213c2e2f47944e61 (patch) | |
| tree | bcb419128a1444dfff3af77fae9eb8b36c8b6ad8 | |
| parent | 9e5db99d3183a849c67ef3dd1c7d3adb0aa3b4b7 (diff) | |
| download | emacs-9e5fd29bede00905d7ff95ea213c2e2f47944e61.tar.gz emacs-9e5fd29bede00905d7ff95ea213c2e2f47944e61.zip | |
Fix previous manual mis-merge of dired-aux
* lisp/dired-aux.el (dired-rename-file): Fix manual mis-merge of
previous patch.
| -rw-r--r-- | lisp/dired-aux.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index eeb06beafd3..82f4455392e 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el | |||
| @@ -1689,7 +1689,8 @@ unless OK-IF-ALREADY-EXISTS is non-nil." | |||
| 1689 | (set-visited-file-name newname nil t))) | 1689 | (set-visited-file-name newname nil t))) |
| 1690 | (dired-remove-file file) | 1690 | (dired-remove-file file) |
| 1691 | ;; See if it's an inserted subdir, and rename that, too. | 1691 | ;; See if it's an inserted subdir, and rename that, too. |
| 1692 | (dired-rename-subdir file newname)) | 1692 | (when (file-directory-p file) |
| 1693 | (dired-rename-subdir file newname))) | ||
| 1693 | 1694 | ||
| 1694 | (defun dired-rename-subdir (from-dir to-dir) | 1695 | (defun dired-rename-subdir (from-dir to-dir) |
| 1695 | (setq from-dir (file-name-as-directory from-dir) | 1696 | (setq from-dir (file-name-as-directory from-dir) |