diff --git a/Cask b/Cask index cc0903bb6..5633d31d1 100644 --- a/Cask +++ b/Cask @@ -122,6 +122,9 @@ (depends-on "yaml-mode" :git "https://github.com/antalk2/yaml-mode") (depends-on "toml-mode") +;; Lisp -- modules/module-lisp.el +(depends-on "slime") + ;; Golang -- modules/module-go.el (depends-on "go-mode") (depends-on "go-eldoc") diff --git a/init.el b/init.el index aec20be37..2e7f5838f 100644 --- a/init.el +++ b/init.el @@ -78,7 +78,7 @@ module-csharp ; unity, .NET, and mono shenanigans module-collab ; wonewy, I'm so wonewy~ module-data ; dbs 'n data formats - module-elisp ; drowning in parentheses + module-lisp ; drowning in parentheses module-go ; a hipster dialect module-java ; the poster child for carpal tunnel syndome module-js ; all(hope(abandon(ye(who(enter(here)))))) diff --git a/modules/lib/defuns-elisp.el b/modules/lib/defuns-lisp.el similarity index 81% rename from modules/lib/defuns-elisp.el rename to modules/lib/defuns-lisp.el index 7db422605..c0e23ee9a 100644 --- a/modules/lib/defuns-elisp.el +++ b/modules/lib/defuns-lisp.el @@ -1,4 +1,4 @@ -;;; defuns-elisp.el +;;; defuns-lisp.el ;;;###autoload (defun narf/elisp-find-function-at-pt () @@ -12,5 +12,5 @@ (let ((func (function-called-at-point))) (if func (find-function-other-window func)))) -(provide 'defuns-elisp) -;;; defuns-elisp.el ends here +(provide 'defuns-lisp) +;;; defuns-lisp.el ends here diff --git a/modules/module-elisp.el b/modules/module-lisp.el similarity index 58% rename from modules/module-elisp.el rename to modules/module-lisp.el index 008f813b1..e00a43302 100644 --- a/modules/module-elisp.el +++ b/modules/module-lisp.el @@ -1,4 +1,4 @@ -;;; module-elisp --- all things emacs lisp +;;; module-lisp --- all things lisp ;; see lib/elisp-defuns.el (add-hook! emacs-lisp-mode 'turn-on-eldoc-mode) @@ -18,21 +18,21 @@ (add-to-list 'imenu-generic-expression '("Package" - "\\(^\\s-*(use-package +\\)\\(\\_<.+\\_>\\)" 2))) + "\\(^\\s-*(use-package +\\)\\(\\_<.+\\_>\\)" 2)) -;; Highlight extra NARF keywords -(let ((keywords '("add-hook!" - "bind!" - "after!" - "λ" - "in!" - "define-company-backend!" - "define-text-object!" - "define-builder!" - ))) - (font-lock-add-keywords 'emacs-lisp-mode - `((,(concat "(\\s-*" (regexp-opt keywords 'paren) "\\_>") - 1 font-lock-keyword-face)) 'append)) + ;; Highlight extra NARF keywords + (let ((keywords '("add-hook!" + "bind!" + "after!" + "λ" + "in!" + "define-company-backend!" + "define-text-object!" + "define-builder!" + ))) + (font-lock-add-keywords 'emacs-lisp-mode + `((,(concat "(\\s-*" (regexp-opt keywords 'paren) "\\_>") + 1 font-lock-keyword-face)) 'append))) (font-lock-add-keywords 'emacs-lisp-mode `(("\\(lambda\\)" (0 (narf/show-as ?λ))))) @@ -42,5 +42,9 @@ :m "gd" 'narf/elisp-find-function-at-pt :m "gD" 'narf/elisp-find-function-at-pt-other-window) -(provide 'module-elisp) +(use-package slime :defer t + :config + (setq inferior-lisp-program "clisp")) + +(provide 'module-lisp) ;;; module-elisp.el ends here