From daeb01f134721b5a6b75c5578ed7cf5309727d02 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Fri, 6 May 2016 12:51:50 +0200 Subject: Emacs: Make dtrt and editorconfig play together --- tag-emacs/emacs.d/init.org | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tag-emacs') diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org index b9518d34..65a1c437 100644 --- a/tag-emacs/emacs.d/init.org +++ b/tag-emacs/emacs.d/init.org @@ -738,9 +738,12 @@ guesses the correct settings for me. #+BEGIN_SRC emacs-lisp (use-package dtrt-indent :config (progn - (dtrt-indent-mode 1) - (add-hook 'editorconfig-custom-hooks (lambda () - (dtrt-indent-undo))) + (defun ap/dtrt-adapt-if-needed () + (unless editorconfig-mode + (dtrt-adapt))) + (if (fboundp #'editorconfig-mode) + (add-hook 'after-change-major-mode-hook #'ap/dtrt-adapt-if-needed) + (add-hook 'after-change-major-mode-hook #'dtrt-indent-adapt)) (defadvice dtrt-indent-try-set-offset (after toggle-smart-tabs activate) (smart-tabs-mode (or indent-tabs-mode -1))))) #+END_SRC -- cgit 1.4.1