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

General refactors & reformatting

Browse source
This commit is contained in:
Henrik Lissner 2019-12-22 23:02:54 -05:00
parent 327d359fd3
commit 213a6fda86
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/core-projects.el
View file

@ -157,7 +157,7 @@ c) are not valid projectile projects."
;; Fix breakage on windows in git projects with submodules, since Windows ;; Fix breakage on windows in git projects with submodules, since Windows
;; doesn't have tr ;; doesn't have tr
((not (executable-find "tr")) (IS-WINDOWS
(setq projectile-git-submodule-command nil))) (setq projectile-git-submodule-command nil)))
(defadvice! doom--projectile-cache-timers-a () (defadvice! doom--projectile-cache-timers-a ()
@ -184,12 +184,11 @@ the command instead."
;; Projectile root-searching functions can cause an infinite loop on TRAMP ;; Projectile root-searching functions can cause an infinite loop on TRAMP
;; connections, so disable them. ;; connections, so disable them.
;; TODO Is this still necessary? ;; TODO Is this still necessary?
(defadvice! doom--projectile-locate-dominating-file-a (orig-fn file name) (defadvice! doom--projectile-locate-dominating-file-a (file _name)
"Don't traverse the file system if on a remote connection." "Don't traverse the file system if on a remote connection."
:around #'projectile-locate-dominating-file :before-while #'projectile-locate-dominating-file
(when (and (stringp file) (and (stringp file)
(not (file-remote-p file nil t))) (not (file-remote-p file nil t)))))
(funcall orig-fn file name))))
;; ;;

4
modules/lang/emacs-lisp/config.el
View file

@ -167,8 +167,8 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.")
(set-yas-minor-mode! 'buttercup-minor-mode) (set-yas-minor-mode! 'buttercup-minor-mode)
(when (featurep 'evil) (when (featurep 'evil)
(add-hook 'buttercup-minor-mode-hook #'evil-normalize-keymaps)) (add-hook 'buttercup-minor-mode-hook #'evil-normalize-keymaps))
(map! :map buttercup-minor-mode-map (map! :localleader
:localleader :map buttercup-minor-mode-map
:prefix "t" :prefix "t"
"t" #'+emacs-lisp/buttercup-run-file "t" #'+emacs-lisp/buttercup-run-file
"a" #'+emacs-lisp/buttercup-run-project "a" #'+emacs-lisp/buttercup-run-project

15
modules/lang/haskell/packages.el
View file

@ -3,10 +3,11 @@
(package! haskell-mode) (package! haskell-mode)
(cond ((featurep! +dante) (when (featurep! +dante)
(package! dante) (package! dante)
(package! attrap)) (package! attrap))
((featurep! +lsp) (when (featurep! +lsp)
(package! lsp-haskell)) (package! lsp-haskell))
((featurep! +intero) ; DEPRECATED ;; DEPRECATED
(package! intero))) (when (featurep! +intero)
(package! intero))