summaryrefslogtreecommitdiffstats
path: root/emacs
diff options
context:
space:
mode:
authorGravatar Tom Willemse2015-12-17 01:15:30 +0100
committerGravatar Tom Willemse2015-12-17 01:15:30 +0100
commit40b26e86cf6eef2d115e3a6335dd87f808885bfd (patch)
treeaa433a4ba2941a1b7bcf948918551b71aa69fc3b /emacs
parent7fde32a3c506921bb3162bf687e659461b2d200e (diff)
downloaddotfiles-40b26e86cf6eef2d115e3a6335dd87f808885bfd.tar.gz
dotfiles-40b26e86cf6eef2d115e3a6335dd87f808885bfd.zip
Move indent-defun to editing library
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/init.el9
-rw-r--r--emacs/.emacs.d/site-lisp/oni-editing.el8
2 files changed, 9 insertions, 8 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 09fdbe0..cb5f0f2 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -148,13 +148,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 indent-defun ()
- "Indent the current defun."
- (interactive)
- (save-excursion
- (mark-defun)
- (indent-region (region-beginning) (region-end))))
-
(defun oni:eshell-C-d ()
"Either call `delete-char' interactively or quit."
(interactive)
@@ -1132,7 +1125,7 @@ If no direction is given, don't split."
(global-set-key (kbd "C-M-d") 'kill-word)
(global-set-key (kbd "C-M-w") 'backward-kill-word)
(global-set-key (kbd "C-M-x") 'smex-major-mode-commands)
-(global-set-key (kbd "C-M-z") 'indent-defun)
+(global-set-key (kbd "C-M-z") 'oni:indent-defun)
(global-set-key (kbd "C-S-k") 'kill-whole-line)
(global-set-key (kbd "C-c +") #'oni:increase-number-at-point)
(global-set-key (kbd "C-c -") #'oni:decrease-number-at-point)
diff --git a/emacs/.emacs.d/site-lisp/oni-editing.el b/emacs/.emacs.d/site-lisp/oni-editing.el
index ff8a155..97ca1f2 100644
--- a/emacs/.emacs.d/site-lisp/oni-editing.el
+++ b/emacs/.emacs.d/site-lisp/oni-editing.el
@@ -58,6 +58,14 @@
(oni:change-number-at-point #'1+))
;;;###autoload
+(defun oni:indent-defun ()
+ "Indent the current defun."
+ (interactive)
+ (save-excursion
+ (mark-defun)
+ (indent-region (region-beginning) (region-end))))
+
+;;;###autoload
(defun oni:upcase-prev (num)
(interactive "p")
(oni:change-prev-case num 'up))