Skip to content
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

no expand the ignored child dirs #31

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

no expand the ignored child dirs #31

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77dd987
no expand the ignored child dirs
aki2o Feb 10, 2014
529a8d2
fixed the point
aki2o Feb 11, 2014
3ea8288
added slot of item for ignore
aki2o Mar 23, 2014
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
30 changes: 21 additions & 9 deletions direx.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@
:type 'string
:group 'direx)

(defcustom direx:ignored-dirs-regexp
(concat "^" (regexp-opt '(".svn" ".git" ".hg")) "$")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To use \\`` and \'is better than^and$. </code>^<code>is anchor of beginning of line and$is end of line. On the other hand,\`` is anchor of beginning of string and \\' end of string.

""
:type 'string
:group 'direx)



;;; Utilities
Expand Down Expand Up @@ -338,10 +344,12 @@ mouse-2: find this node in other window"))
(unless (direx:item-open item)
(direx:item-expand item)))

(defun direx:item-expand-recursively (item)
(direx:item-expand item)
(dolist (child (direx:item-children item))
(direx:item-expand-recursively child)))
(defun direx:item-expand-recursively (item &optional noexpand-ignored)
(when (or (not noexpand-ignored)
(not (eq (direx:item-face item) 'dired-ignored)))
(direx:item-expand item)
(dolist (child (direx:item-children item))
(direx:item-expand-recursively child t))))

(defun direx:item-collapse (item)
(unless (direx:item-leaf-p item)
Expand Down Expand Up @@ -578,11 +586,15 @@ mouse-2: find this node in other window"))
(display-buffer (dired-noselect dirname))))

(defmethod direx:make-item ((dir direx:directory) parent)
(make-instance 'direx:directory-item
:tree dir
:parent parent
:face 'dired-directory
:keymap direx:file-keymap))
(let* ((basename (direx:tree-name dir))
(face (or (when (string-match direx:ignored-dirs-regexp basename)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using if and else is better than usingor and when

'dired-ignored)
'dired-directory)))
(make-instance 'direx:directory-item
:tree dir
:parent parent
:face face
:keymap direx:file-keymap)))



Expand Down