diff options
author | Tom Willemsen | 2012-11-21 01:23:32 +0100 |
---|---|---|
committer | Tom Willemsen | 2012-11-21 01:23:32 +0100 |
commit | fa717d86a07d009ab324a40cd8dbf539e61a9da3 (patch) | |
tree | 94c8970eff710864d3162bb7b14476e6fba8280c /.emacs.d/site-lisp | |
parent | 258cda86caf88bcfb16aa7ab59f790f249b92d63 (diff) | |
parent | c545bedf7fa756531b0c486845a6f9af36a83eb2 (diff) | |
download | dotfiles-fa717d86a07d009ab324a40cd8dbf539e61a9da3.tar.gz dotfiles-fa717d86a07d009ab324a40cd8dbf539e61a9da3.zip |
Merge remote-tracking branch 'origin/master' into phoenix
Diffstat (limited to '.emacs.d/site-lisp')
-rw-r--r-- | .emacs.d/site-lisp/oni.el | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 439be25..251dca2 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -272,6 +272,13 @@ If COUNT has been specified indent by that much, otherwise look at (kill-region (region-beginning) (region-end)) (kill-line))) +(defun oni:load-hippie-exp (other) + "Make sure both hippie-expand and yasnippet are loaded in order + to add yasnippet's expand function to hippie-expand." + (require other) + (add-to-list 'hippie-expand-try-functions-list + 'yas/hippie-try-expand)) + (defun oni:lua-mode-func() "Function for `lua-mode-hook'." (local-unset-key (kbd ")")) @@ -394,6 +401,12 @@ When dealing with braces, add another line and indent that too." (rainbow-delimiters-mode) (setq fci-rule-column 80)) +(defun oni:pretty-control-l-function (win) + "Just make a string of either `fci-rule-colum' or `fill-column' +length -1. Use the `-' character. WIN is ignored." + (make-string + (1- (if (boundp 'fci-rule-column) fci-rule-column fill-column)) ?-)) + (defun oni:prog-mode-func () "Function for `prog-mode-hook'." (rainbow-delimiters-mode) |