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

completion/ivy: fix cyclical-load errors when compiling

Browse source
This commit is contained in:
Henrik Lissner 2017-12-17 00:03:14 -05:00
parent b8a969361d
commit 73333784f8
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/completion/ivy/config.el
View file

@ -62,7 +62,17 @@ immediately runs it on the current candidate (ending the ivy session)."
(ivy-set-display-transformer #'ivy-switch-buffer #'+ivy-buffer-transformer) (ivy-set-display-transformer #'ivy-switch-buffer #'+ivy-buffer-transformer)
(ivy-set-display-transformer #'ivy-switch-buffer-other-window #'+ivy-buffer-transformer) (ivy-set-display-transformer #'ivy-switch-buffer-other-window #'+ivy-buffer-transformer)
(ivy-set-display-transformer #'+ivy/switch-workspace-buffer #'+ivy-buffer-transformer) (ivy-set-display-transformer #'+ivy/switch-workspace-buffer #'+ivy-buffer-transformer)
(ivy-set-display-transformer #'counsel-recentf #'abbreviate-file-name)) (ivy-set-display-transformer #'counsel-recentf #'abbreviate-file-name)
(nconc ivy-sort-functions-alist
'((persp-kill-buffer . nil)
(persp-remove-buffer . nil)
(persp-add-buffer . nil)
(persp-switch . nil)
(persp-window-switch . nil)
(persp-frame-switch . nil)
(+workspace/switch-to . nil)
(+workspace/delete . nil))))
(def-package! swiper :commands (swiper swiper-all)) (def-package! swiper :commands (swiper swiper-all))

14
modules/feature/workspaces/config.el
View file

@ -93,17 +93,5 @@ Allows a perspective-specific buffer list via `+workspaces-buffer-list'."
(persp-add-buffer buffer (get-current-persp) nil) (persp-add-buffer buffer (get-current-persp) nil)
(force-mode-line-update t))) (force-mode-line-update t)))
(advice-add #'switch-to-buffer :after #'+workspaces*auto-add-buffer) (advice-add #'switch-to-buffer :after #'+workspaces*auto-add-buffer)
(advice-add #'display-buffer :after #'+workspaces*auto-add-buffer) (advice-add #'display-buffer :after #'+workspaces*auto-add-buffer))
;;
(after! ivy
(nconc ivy-sort-functions-alist
'((persp-kill-buffer . nil)
(persp-remove-buffer . nil)
(persp-add-buffer . nil)
(persp-switch . nil)
(persp-window-switch . nil)
(persp-frame-switch . nil)
(+workspace/switch-to . nil)
(+workspace/delete . nil)))))