Skip to content

Commit b05ceab

Browse files
committed
Move VC character to the beginning of the line
1 parent b16d015 commit b05ceab

File tree

1 file changed

+11
-16
lines changed

1 file changed

+11
-16
lines changed

neotree.el

+11-16
Original file line numberDiff line numberDiff line change
@@ -1162,34 +1162,29 @@ PATH is value."
11621162
(neo-buffer--newline-and-begin))
11631163

11641164
(defun neo-buffer--insert-dir-entry (node depth expanded)
1165-
(let ((btn-start-pos nil)
1166-
(btn-end-pos nil)
1167-
(node-short-name (neo-path--file-short-name node)))
1165+
(let ((node-short-name (neo-path--file-short-name node)))
11681166
(insert-char ?\s (* (- depth 1) 2)) ; indent
11691167
(when (memq 'char neo-vc-integration)
11701168
(insert-char ?\s 2))
1171-
(setq btn-start-pos (point))
1172-
(neo-buffer--insert-fold-symbol (if expanded 'open 'close))
1173-
(neo-buffer--insert-with-face (concat node-short-name "/")
1174-
'neo-dir-link-face)
1175-
(setq btn-end-pos (point))
1176-
(make-button btn-start-pos
1177-
btn-end-pos
1178-
'follow-link t
1179-
'face neo-button-face
1180-
'neo-full-path node
1181-
'keymap neotree-dir-button-keymap)
1169+
(neo-buffer--insert-fold-symbol
1170+
(if expanded 'open 'close))
1171+
(insert-button (concat node-short-name "/")
1172+
'follow-link t
1173+
'face neo-dir-link-face
1174+
'neo-full-path node
1175+
'keymap neotree-dir-button-keymap)
11821176
(neo-buffer--node-list-set nil node)
11831177
(neo-buffer--newline-and-begin)))
11841178

11851179
(defun neo-buffer--insert-file-entry (node depth)
11861180
(let ((node-short-name (neo-path--file-short-name node))
1187-
(vc (when neo-vc-integration (neo-vc-for-node node))))
1181+
(vc (or neo-vc-integration (neo-vc-for-node node)
1182+
?\s)))
11881183
(insert-char ?\s (* (- depth 1) 2)) ; indent
1189-
(neo-buffer--insert-fold-symbol 'leaf)
11901184
(when (memq 'char neo-vc-integration)
11911185
(insert-char (car vc))
11921186
(insert-char ?\s))
1187+
(neo-buffer--insert-fold-symbol 'leaf)
11931188
(insert-button node-short-name
11941189
'follow-link t
11951190
'face (if (memq 'face neo-vc-integration)

0 commit comments

Comments
 (0)