From 0666b1697db194513be90bc50cbd06234912d4da Mon Sep 17 00:00:00 2001
From: Zedhugh Chen <zedhugh@gmail.com>
Date: Thu, 15 Dec 2022 21:31:10 +0800
Subject: [PATCH] update editorconfig config

---
 lisp/init-editorconfig.el | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/lisp/init-editorconfig.el b/lisp/init-editorconfig.el
index 1cd4af6..5f28f46 100644
--- a/lisp/init-editorconfig.el
+++ b/lisp/init-editorconfig.el
@@ -3,12 +3,15 @@
 (autoload 'editorconfig-mode "editorconfig" "" t)
 
 (defun creature/editorconfig-setup ()
-  (editorconfig-mode 1)
-  ;; 修复通过打开文件启动该插件时打开的文件缩进配置不对
-  (editorconfig-mode-apply)
-  (remove-hook 'find-file-hook #'creature/editorconfig-setup)
-  (cancel-timer creature/editorconfig-timer)
-  (makunbound 'creature/editorconfig-timer))
+  ;; 防止多次执行时因为定时器被清除而报错
+  (when (and (boundp 'creature/editorconfig-timer)
+             (timerp creature/editorconfig-timer))
+    (editorconfig-mode 1)
+    ;; 修复通过打开文件启动该插件时打开的文件缩进配置不对
+    (editorconfig-mode-apply)
+    (remove-hook 'find-file-hook #'creature/editorconfig-setup)
+    (cancel-timer creature/editorconfig-timer)
+    (makunbound 'creature/editorconfig-timer)))
 
 (setq creature/editorconfig-timer
       (run-with-idle-timer 5 nil #'creature/editorconfig-setup))
@@ -16,4 +19,9 @@
 (add-hook 'find-file-hook #'creature/editorconfig-setup)
 
 
+(autoload 'editorconfig-conf-mode "editorconfig-conf-mode" "" t)
+(add-to-list 'auto-mode-alist
+             '("\\.editorconfig\\'" . editorconfig-conf-mode))
+
+
 (provide 'init-editorconfig)