emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #100: void variables in +ivy--get-buffers

Browse source
This commit is contained in:
Henrik Lissner 2017-06-09 13:16:30 +02:00
parent ae2ca94609
commit 102c7df400
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

45
modules/completion/ivy/autoload/ivy.el
View file

@ -3,38 +3,37 @@
;; Show more information in ivy-switch-buffer; and only display
;; workgroup-relevant buffers.
(defun +ivy--get-buffers (&optional buffer-list)
(let ((min-name 5)
(min-mode 5)
(proot (doom-project-root)))
(cl-loop for buf in (or buffer-list (doom-buffer-list))
(let* ((buffer-list (or buffer-list (doom-buffer-list)))
(min-name
(+ 5 (cl-loop for buf in buffer-list
maximize (length (buffer-name buf)))))
(min-mode
(+ 5 (cl-loop for buf in buffer-list
maximize (length (symbol-name (buffer-local-value 'major-mode buf)))))))
(cl-loop
with project-root = (doom-project-root)
for buf in buffer-list
collect
(destructuring-bind (type mode path)
(+ivy--get-buffer-attrs buf proot)
(format (format "%%-%ds %%-%ds %%s" min-name min-mode)
type mode (or path ""))))))
(defun +ivy--get-buffer-attrs (b &optional project-root)
(with-current-buffer b
(let ((buffer-name (buffer-name b))
(mode-name (symbol-name major-mode)))
(when (> (length buffer-name) min-name)
(setq min-name (+ (length buffer-name) 15)))
(when (> (length mode-name) min-mode)
(setq min-mode (+ (length mode-name) 3)))
(with-current-buffer buf
(list (concat
(propertize buffer-name
(let ((buffer-name (buffer-name buf)))
(propertize
buffer-name
'face (cond ((string-match-p "^ ?\\*" buffer-name)
'font-lock-comment-face)
((and project-root
(not (string= project-root (doom-project-root))))
'font-lock-keyword-face)
((not (string= project-root (doom-project-root)))
'warning)
(buffer-read-only
'error)))
'error))))
(when (and buffer-file-name (buffer-modified-p))
(propertize "[+]" 'face 'doom-modeline-buffer-modified)))
(propertize mode-name 'face 'font-lock-constant-face)
(propertize (symbol-name major-mode) 'face 'font-lock-constant-face)
(when buffer-file-name
(abbreviate-file-name (file-name-directory buffer-file-name)))))))
(abbreviate-file-name
(file-name-directory buffer-file-name)))))
(format (format "%%-%ds %%-%ds %%s" min-name min-mode)
type mode (or path ""))))))
(defun +ivy--select-buffer-action (buffer)
(ivy--switch-buffer-action