Change faces on doom/ivy-switch-(project-)?buffer + refactor

This commit is contained in:
Henrik Lissner 2016-10-05 08:15:10 +02:00
parent bad68fc45c
commit abb92a41e7

View file

@ -23,19 +23,19 @@
(concat (concat
(propertize buffer-name (propertize buffer-name
'face (cond ((string-match-p "^ ?\\*" buffer-name) 'face (cond ((string-match-p "^ ?\\*" buffer-name)
'font-lock-doc-face) 'font-lock-comment-face)
((not (string= proot (doom/project-root))) ((not (string= proot (doom/project-root)))
'font-lock-keyword-face) 'font-lock-keyword-face)
(buffer-read-only (buffer-read-only
'error))) 'error)))
(when (and buffer-file-name (buffer-modified-p)) (when (and buffer-file-name (buffer-modified-p))
(propertize "[+]" 'face 'mode-line-is-modified))) (propertize "[+]" 'face 'doom-modeline-buffer-modified)))
(propertize mode-name 'face 'font-lock-constant-face) (propertize mode-name 'face 'font-lock-constant-face)
(when buffer-file-name (when buffer-file-name
(f-slash (abbreviate-file-name (f-dirname buffer-file-name)))))))) (f-slash (abbreviate-file-name (f-dirname buffer-file-name))))))))
(or buffer-list (doom/get-buffers)))))) (or buffer-list (doom/get-buffers))))))
(defun doom-ivy-select-buffer-action (buffer) (defun doom--ivy-select-buffer-action (buffer)
(ivy--switch-buffer-action (ivy--switch-buffer-action
(s-chop-suffix (s-chop-suffix
"[+]" "[+]"
@ -49,7 +49,7 @@ all open buffers."
(ivy-read (format "%s buffers: " (if all-p "All" "Project")) (ivy-read (format "%s buffers: " (if all-p "All" "Project"))
(doom-ivy-get-buffers (if all-p (buffer-list))) (doom-ivy-get-buffers (if all-p (buffer-list)))
:matcher #'ivy--switch-buffer-matcher :matcher #'ivy--switch-buffer-matcher
:action #'doom-ivy-select-buffer-action :action #'doom--ivy-select-buffer-action
:keymap ivy-switch-buffer-map :keymap ivy-switch-buffer-map
:caller 'doom/ivy-switch-project-buffer)) :caller 'doom/ivy-switch-project-buffer))