@@ -1162,34 +1162,29 @@ PATH is value."
1162
1162
(neo-buffer--newline-and-begin))
1163
1163
1164
1164
(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)))
1168
1166
(insert-char ?\s (* (- depth 1 ) 2 )) ; indent
1169
1167
(when (memq 'char neo-vc-integration)
1170
1168
(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)
1182
1176
(neo-buffer--node-list-set nil node)
1183
1177
(neo-buffer--newline-and-begin)))
1184
1178
1185
1179
(defun neo-buffer--insert-file-entry (node depth )
1186
1180
(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 )))
1188
1183
(insert-char ?\s (* (- depth 1 ) 2 )) ; indent
1189
- (neo-buffer--insert-fold-symbol 'leaf )
1190
1184
(when (memq 'char neo-vc-integration)
1191
1185
(insert-char (car vc))
1192
1186
(insert-char ?\s ))
1187
+ (neo-buffer--insert-fold-symbol 'leaf )
1193
1188
(insert-button node-short-name
1194
1189
'follow-link t
1195
1190
'face (if (memq 'face neo-vc-integration)
0 commit comments