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

Smarter associate! macro

Browse source
This commit is contained in:
Henrik Lissner 2016-01-21 19:33:54 -05:00
parent aac4d4ee48
commit 9bda8c3112
3 changed files with 29 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
core/core-defuns.el
View file

@ -92,22 +92,27 @@ Examples:
(declare (indent 1)) (declare (indent 1))
(let* ((minor-p (assoc mode minor-mode-alist))) (let* ((minor-p (assoc mode minor-mode-alist)))
`(progn `(progn
(,@(when match (,@(cond ((or files in)
`(add-to-list ',(if minor-p 'narf-auto-minor-mode-alist 'auto-mode-alist) (when (and files (not (or (listp files)
(cons ,match ',mode)))) (stringp files))))
(,@(when files (user-error "associate! :files expects a string or list of strings"))
(unless (or (listp files) (stringp files)) (let ((hook-name (intern (format "narf--init-mode-%s" mode))))
(user-error "associate! :files expects a string or list of strings")) `(progn
(let ((hook-name (intern (format "narf--init-mode-%s" mode)))) (defun ,hook-name ()
`(progn (when (and (if ,match (string-match-p ,match (buffer-file-name)) t)
(defun ,hook-name () (or ,(not files)
(when (and (not ,mode) (and (not ,mode)
(narf/project-has-files ,@(-list files))) (narf/project-has-files ,@(-list files)))))
(,mode 1))) (,mode 1)))
,@(if (and in (listp in)) ,@(if (and in (listp in))
(mapcar (lambda (h) `(add-hook ',h ',hook-name)) (mapcar (lambda (h) `(add-hook ',h ',hook-name))
(mapcar (lambda (m) (intern (format "%s-hook" m))) in)) (mapcar (lambda (m) (intern (format "%s-hook" m))) in))
`((add-hook 'find-file-hook ',hook-name)))))))))) `((add-hook 'find-file-hook ',hook-name))))))
(match
`(add-to-list ',(if minor-p 'narf-auto-minor-mode-alist 'auto-mode-alist)
(cons ,match ',mode)))
(t (user-error "associate! invalid rules for mode [%s] (in %s) (match %s) (files %s)"
mode in match files)))))))
(after! evil (after! evil
;; Register keywords for proper indentation (see `map!') ;; Register keywords for proper indentation (see `map!')

2
modules/module-python.el
View file

@ -24,7 +24,7 @@
:commands nose-mode :commands nose-mode
:preface (defvar nose-mode-map (make-sparse-keymap)) :preface (defvar nose-mode-map (make-sparse-keymap))
:init :init
(associate! nose-mode :pattern "/test_.+\\.py\\'") (associate! nose-mode :match "/test_.+\\.py\\'")
:config :config
(map! :map nose-mode-map (map! :map nose-mode-map
(:localleader (:localleader

10
modules/module-web.el
View file

@ -107,9 +107,12 @@
:keymap (make-sparse-keymap) :keymap (make-sparse-keymap)
(add-yas-minor-mode! 'jekyll-mode)) (add-yas-minor-mode! 'jekyll-mode))
(associate! jekyll-mode (associate! jekyll-mode
:match "/\\(css\\|_\\(layouts\\|posts\\|sass\\)\\)/.+$" :match "/\\(\\(css\\|_\\(layouts\\|posts\\|sass\\)\\)/.+\\|.+.html\\)$"
:files ("config.yml" "_layouts") :files ("config.yml" "_layouts")
:in (web-mode scss-mode html-mode markdown-mode)) :in (web-mode scss-mode html-mode markdown-mode))
(add-hook! jekyll-mode
(when (eq major-mode 'web-mode)
(web-mode-set-engine "django")))
;; (after! company-dict (add-to-list 'company-dict-minor-mode-alist 'jekyll-mode)) ;; (after! company-dict (add-to-list 'company-dict-minor-mode-alist 'jekyll-mode))
(define-minor-mode wordpress-mode (define-minor-mode wordpress-mode
@ -118,8 +121,9 @@
:lighter " wp" :lighter " wp"
:keymap (make-sparse-keymap) :keymap (make-sparse-keymap)
(add-yas-minor-mode! 'wordpress-mode)) (add-yas-minor-mode! 'wordpress-mode))
(associate! wordpress-mode :match "/wp-\\(content\\|admin\\|includes\\)/.+$") (associate! wordpress-mode
(associate! wordpress-mode :match "/wp-.+\\.php$") :match "/wp-\\(\\(content\\|admin\\|includes\\)/\\)?.+$"
:files ("wp-config.php" "wp-content"))
;; (after! company-dict (add-to-list 'company-dict-minor-mode-alist 'wordpress-mode)) ;; (after! company-dict (add-to-list 'company-dict-minor-mode-alist 'wordpress-mode))
(provide 'module-web) (provide 'module-web)