summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2015-12-17 01:33:52 +0100
committerGravatar Tom Willemse2015-12-17 01:33:52 +0100
commit4d00b7c7c3b85105c89b45ae3dfbf274ee9b89da (patch)
tree7c37e1231cdf0e6ef1ff9c0952bbad56a72f5103
parent44a8d0139d0fe3ea241e404ffcafdf749daef9ef (diff)
downloaddotfiles-4d00b7c7c3b85105c89b45ae3dfbf274ee9b89da.tar.gz
dotfiles-4d00b7c7c3b85105c89b45ae3dfbf274ee9b89da.zip
Add lua mode library
-rw-r--r--emacs/.emacs.d/init.el9
-rw-r--r--emacs/.emacs.d/site-lisp/oni-lua.el37
2 files changed, 38 insertions, 8 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 9446e03..e84b396 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -141,12 +141,6 @@ MODE1 is enabled and vice-versa."
"Set the `disabled' property for each item in FUNCTIONS to nil."
(mapc #'(lambda (f) (put f 'disabled nil)) functions))
-(defun oni:lua-mode-func()
- "Function for `lua-mode-hook'."
- (local-unset-key (kbd ")"))
- (local-unset-key (kbd "]"))
- (local-unset-key (kbd "}")))
-
(defun oni:make-readable ()
"Make non-programming buffers a little more readable."
(setq line-spacing .2))
@@ -1043,8 +1037,7 @@ If no direction is given, don't split."
(lambda () (setf ac-sources '(ac-source-slime-simple)))
#'oni:set-emacs-lisp-symbols #'paredit-mode)
-(oni:add-hooks 'lua-mode-hook
- #'oni:lua-mode-func)
+(oni:add-hooks 'lua-mode-hook 'oni:set-keys-for-lua)
(oni:add-hooks 'markdown-mode-hook
#'whitespace-mode #'oni:markdown-mode-func)
diff --git a/emacs/.emacs.d/site-lisp/oni-lua.el b/emacs/.emacs.d/site-lisp/oni-lua.el
new file mode 100644
index 0000000..92fa4c0
--- /dev/null
+++ b/emacs/.emacs.d/site-lisp/oni-lua.el
@@ -0,0 +1,37 @@
+;;; oni-lua.el --- Extra Lua commands and functions -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2015 Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Here are some extra commands and functions for Lua source buffers.
+
+;;; Code:
+
+(require 'lua-mode)
+
+;;;###autoload
+(defun oni:set-keys-for-lua ()
+ "Set keys for `lua-mode'."
+ (define-key lua-mode-map (kbd ")") nil)
+ (define-key lua-mode-map (kbd "]") nil)
+ (define-key lua-mode-map (kbd "}") nil))
+
+(provide 'oni-lua)
+;;; oni-lua.el ends here