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

feature/file-templates: fix doom module templates

Browse source 
There were cases where certain Doom module templates weren't correctly
expanded (when your private directory is symlinked).
This commit is contained in:
Henrik Lissner 2018-05-16 18:24:47 +02:00
parent a1e49d174a
commit 06f7aa2881
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/feature/file-templates/config.el
View file

@ -62,7 +62,12 @@ in a project."
auto-insert-alist))) auto-insert-alist)))
(mapc #'+file-templates-add (mapc #'+file-templates-add
(let ((doom (concat "/" (regexp-opt '(".emacs.d" ".doom.d" "doom-emacs" ".config/doom")) "/"))) (let* ((dirs (mapcar (lambda (path) (string-remove-prefix (expand-file-name "~") path))
(cl-remove-duplicates
(append (list doom-emacs-dir doom-private-dir)
(mapcar #'file-truename (list doom-emacs-dir doom-private-dir)))
:test 'string=)))
(doom (regexp-opt dirs)))
`(;; General `(;; General
("/\\.gitignore$" "__" gitignore-mode) ("/\\.gitignore$" "__" gitignore-mode)
("/Dockerfile$" "__" dockerfile-mode) ("/Dockerfile$" "__" dockerfile-mode)
@ -73,8 +78,8 @@ in a project."
("/.dir-locals.el$" nil) ("/.dir-locals.el$" nil)
("-test\\.el$" "__" emacs-ert-mode) ("-test\\.el$" "__" emacs-ert-mode)
(,(concat doom ".+\\.el$") "__doom-module" emacs-lisp-mode) (,(concat doom ".+\\.el$") "__doom-module" emacs-lisp-mode)
(,(concat doom ".*/packages\\.el$") "__doom-packages" emacs-lisp-mode) (,(concat doom "\\(?:.+/\\)?packages\\.el$") "__doom-packages" emacs-lisp-mode)
(,(concat doom ".*/test/.+\\.el$") "__doom-test" emacs-lisp-mode) (,(concat doom "\\(?:.+/\\)?test/.+\\.el$") "__doom-test" emacs-lisp-mode)
(snippet-mode "__" snippet-mode) (snippet-mode "__" snippet-mode)
;; C/C++ ;; C/C++
("\\.h$" "__h" c-mode) ("\\.h$" "__h" c-mode)