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

emacs-lisp: conform to v2 module format

Browse source
This commit is contained in:
Henrik Lissner 2017-02-03 19:22:59 -05:00
parent b7fb8caa24
commit 2b4da7edf5
2 changed files with 55 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,34 +1,62 @@
;;; lang/emacs-lisp/config.el ;;; lang/emacs-lisp/config.el
(add-hook! emacs-lisp-mode (associate! emacs-lisp-mode :match "/Cask$")
'(+emacs-lisp|init (add-hook! emacs-lisp-mode '(highlight-quoted-mode auto-compile-on-save-mode +emacs-lisp|hook))
highlight-quoted-mode
auto-compile-on-save-mode))
(defun +emacs-lisp|init () (after! elisp-mode
;; Real go-to-definition for elisp
(map! :map emacs-lisp-mode-map
:m "gd" '+emacs-lisp/find-function
:leader :m "gd" '+emacs-lisp/find-function-other-window)
;; Don't affect lisp indentation (only `tab-width')
(setq editorconfig-indentation-alist
(delq (assq 'emacs-lisp-mode editorconfig-indentation-alist)
editorconfig-indentation-alist))
(defun +emacs-lisp|hook ()
(setq mode-name "Elisp") ; [pedantry intensifies] (setq mode-name "Elisp") ; [pedantry intensifies]
(add-hook 'before-save-hook 'delete-trailing-whitespace nil t) (add-hook 'before-save-hook 'delete-trailing-whitespace nil t)
(font-lock-add-keywords (font-lock-add-keywords
nil `(("(\\(lambda\\)" (1 (ignore (compose-region (match-beginning 1) (match-end 1) ?λ 'decompose-region)))) nil `(("(\\(lambda\\)" (1 (ignore (compose-region (match-beginning 1) (match-end 1) ?λ 'decompose-region))))
("(\\(\\(doom\\)\\([-:/|!][^) ]*\\)?\\)[) \n]" (1 font-lock-builtin-face)) ("[^'](\\(\\(doom\\)\\([-:/|!][^) ]*\\)?\\)[) \n]" (1 font-lock-builtin-face))
;; Highlight doom macros (macros are fontified in emacs 25+) ;; Highlight doom macros (macros are fontified in emacs 25+)
("(\\([^ ]+!\\)" ("[^'](\\([^ ]+!\\)"
(1 font-lock-keyword-face append)) (1 font-lock-keyword-face append))
;; Ert ;; Ert
("(\\(ert-deftest\\) \\([^ ]+\\)" ("[^'](\\(ert-deftest\\) \\([^ ]+\\)"
(1 font-lock-keyword-face) (1 font-lock-keyword-face)
(2 font-lock-function-name-face)))) (2 font-lock-function-name-face))))
(dolist (i '(("Evil Command" "\\(^\\s-*(evil-define-command +\\)\\(\\_<[^ ]+\\_>\\)" 2) (dolist (i '(("Evil Command" "\\(^\\s-*(evil-define-command +\\)\\(\\_<[^ ]+\\_>\\)" 2)
("Evil Operator" "\\(^\\s-*(evil-define-operator +\\)\\(\\_<[^ ]+\\_>\\)" 2) ("Evil Operator" "\\(^\\s-*(evil-define-operator +\\)\\(\\_<[^ ]+\\_>\\)" 2)
("Package" "\\(^\\s-*(\\(use-package\\|package!\\) +\\)\\(\\_<[^ \n]+\\_>\\)" 3) ("Package" "\\(^\\s-*(\\(use-package\\|package\\)!? +\\)\\(\\_<[^ \n]+\\_>\\)" 3)
("Spaceline Segment" "\\(^\\s-*(spaceline-define-segment +\\)\\(\\_<.+\\_>\\)" 2))) ("Spaceline Segment" "\\(^\\s-*(spaceline-define-segment +\\)\\(\\_<.+\\_>\\)" 2)))
(push i imenu-generic-expression))) (push i imenu-generic-expression))))
(after! auto-compile (after! debug ;; elisp debugging
(map! :map debugger-mode-map
:n "RET" 'debug-help-follow
:n "n" 'debugger-step-through
:n "c" 'debugger-continue))
;;
;; Plugins
;;
(use-package! auto-compile
:commands auto-compile-on-save-mode
:config
(setq auto-compile-display-buffer nil (setq auto-compile-display-buffer nil
auto-compile-use-mode-line nil)) auto-compile-use-mode-line nil))
(after! slime
(setq inferior-lisp-program "clisp")) (use-package! highlight-quoted
:commands highlight-quoted-mode)
(use-package! slime
:config (setq inferior-lisp-program "clisp"))

8
modules/lang/emacs-lisp/packages.el
View file

@ -1,9 +1,5 @@
;;; lang/emacs-lisp/packages.el ;;; lang/emacs-lisp/packages.el
(associate! emacs-lisp-mode :match "\\(/Cask\\|\\.elc?\\(.gz\\)?\\)$") (package! auto-compile)
(package! highlight-quoted)
(package! highlight-quoted :commands highlight-quoted-mode)
(package! auto-compile :commands auto-compile-on-save-mode)
(package! slime) (package! slime)