diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 2235d24..e84ed30 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -31,6 +31,8 @@ (autoload 'sawfish-mode "sawfish" nil t) (autoload 'xmodmap-mode "xmodmap-mode" nil t) (autoload 'jabber-connect "jabber" nil t) +(autoload 'define-slime-contrib "slime") +(autoload 'slime-js-minor-mode "slime-js" nil t) (load (expand-file-name "~/.emacs.d/site-lisp/loaddefs.el")) @@ -379,6 +381,12 @@ If COUNT has been specified indent by that much, otherwise look at (when (buffer-file-name) (hs-minor-mode))) +(defun oni:lua-mode-func() + "Function for `lisp-mode-hook'." + (local-unset-key (kbd ")")) + (local-unset-key (kbd "]")) + (local-unset-key (kbd "}"))) + (defun oni:magit-log-edit-mode-func () "Function for `magit-log-edit-mode-hook'." (auto-fill-mode) @@ -673,6 +681,11 @@ for easy selection." (eval-after-load "info" '(require 'info+)) +(eval-after-load "lua-mode" + `(progn + (modify-syntax-entry ?- "< 12" lua-mode-syntax-table) + (modify-syntax-entry ?\n ">" lua-mode-syntax-table))) + (eval-after-load "mu4e" '(add-to-list 'org-capture-templates @@ -973,6 +986,7 @@ for easy selection." (add-hook 'js-mode-hook 'oni:js-mode-func) (add-hook 'js2-mode-hook 'oni:js2-mode-func) (add-hook 'lisp-mode-hook 'oni:lisp-mode-func) +(add-hook 'lua-mode-hook 'oni:lua-mode-func) (add-hook 'magit-log-edit-mode-hook 'oni:magit-log-edit-mode-func) (add-hook 'markdown-mode-hook 'oni:markdown-mode-func) (add-hook 'message-mode-hook 'oni:message-mode-func)