Skip to content

Commit ba1f4ba

Browse files
authored
Merge pull request #197 from jianingy/side-window
create the neotree window by `display-buffer-in-side-window`.
2 parents ed8de7f + dc74897 commit ba1f4ba

File tree

1 file changed

+1
-32
lines changed

1 file changed

+1
-32
lines changed

neotree.el

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,6 @@ window."
175175
:type 'boolean
176176
:group 'neotree)
177177

178-
(defcustom neo-dont-be-alone nil
179-
"*If non-nil, you cannot left neotree window alone."
180-
:type 'boolean
181-
:group 'neotree)
182-
183178
(defcustom neo-persist-show t
184179
"*If non-nil, NeoTree window will not be turned off while press C\-x 1."
185180
:type 'boolean
@@ -646,9 +641,7 @@ The side is decided according to `neo-window-position'.
646641
The root window is the root window of the selected frame.
647642
_ALIST is ignored."
648643
(let ((window-pos (if (eq neo-window-position 'left) 'left 'right)))
649-
(split-window
650-
(frame-root-window (window-frame (selected-window)))
651-
nil window-pos)))
644+
(display-buffer-in-side-window buffer `((side . ,window-pos)))))
652645

653646
(defun neo-global--create-window ()
654647
"Create global neotree window."
@@ -781,30 +774,6 @@ The description of ARG is in `neotree-enter'."
781774
;; Advices
782775
;;
783776

784-
(defadvice delete-other-windows
785-
(around neotree-delete-other-windows activate)
786-
"Delete all windows except neotree."
787-
(interactive)
788-
(if (neo-global--with-buffer
789-
neo-buffer--persist-show)
790-
(mapc
791-
(lambda (window)
792-
(unless (string-equal (buffer-name (window-buffer window))
793-
neo-buffer-name)
794-
(delete-window window)))
795-
(cdr (window-list)))
796-
ad-do-it))
797-
798-
(defadvice delete-window
799-
(around neotree-delete-window activate)
800-
"Stop to delete window which it is the last window except NeoTree."
801-
(if (and neo-dont-be-alone
802-
(not (eq window
803-
neo-global--window))
804-
(neo-global--alone-p))
805-
(message "only one window other than neotree left. won't close")
806-
ad-do-it))
807-
808777
(defadvice mouse-drag-vertical-line
809778
(around neotree-drag-vertical-line (start-event) activate)
810779
"Drag and drop is not affected by the lock."

0 commit comments

Comments
 (0)