Skip to content

Rewrite dired-subtree--readin to fix several bugs #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
elibarzilay wants to merge 1 commit into from
Closed

Rewrite dired-subtree--readin to fix several bugs #179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions dired-subtree.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,23 +462,20 @@ children."
"Read in the directory.

Return a string suitable for insertion in `dired' buffer."
(with-temp-buffer
(insert-directory dir-name dired-listing-switches nil t)
(delete-char -1)
(goto-char (point-min))
(delete-region
(progn (beginning-of-line) (point))
(progn (forward-line
(if (save-excursion
(forward-line 1)
(end-of-line)
(looking-back "\\."))
3 1)) (point)))
(insert " ")
(while (= (forward-line) 0)
(insert " "))
(delete-char -2)
(buffer-string)))
(let ((switches (or dired-actual-switches dired-listing-switches)))
(with-temp-buffer
(insert-directory dir-name switches nil t)
(delete-char -1)
(goto-char (point-min))
(delete-region (point) (progn (forward-line 1) (point)))
(save-match-data
(while (re-search-forward "^ *d.* \\.\\.?/?\n" nil t)
(delete-region (match-beginning 0) (match-end 0))))
(goto-char (point-min))
(unless (looking-at-p " ")
(let ((indent-tabs-mode nil))
(indent-rigidly (point-min) (point-max) 2)))
(buffer-string))))

;;;###autoload
(defun dired-subtree-insert ()
Expand Down