diff options
Diffstat (limited to '.emacs.d/site-lisp/oni.el')
| -rw-r--r-- | .emacs.d/site-lisp/oni.el | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 79b5f6e..0098ea2 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -61,7 +61,7 @@ DOT are intentionally being skipped." (defvar oni:required-packages '(graphviz-dot-mode htmlize magit rainbow-delimiters rainbow-mode yasnippet markdown-mode flymake flymake-cursor sauron expand-region - fill-column-indicator git-auto-commit-mode idomenu magit smex) + git-auto-commit-mode idomenu magit smex) "List of all the packages I have (want) installed.") (defun oni:after-save-func () @@ -81,7 +81,9 @@ DOT are intentionally being skipped." nil (format "%s%s (in %s minutes)" new-time appt-msg min-to-app) nil) (appt-disp-window min-to-app new-time appt-msg)) - +;; (jabber-send-message (car jabber-connections) +;; "aethon@muc.ryuslash.org" nil "Hi, I'm a programmatic message; this +;; upens up possibilities :)" "groupchat") (defun oni:before-save-func () "Function for `before-save-hook'." (if (eq major-mode 'html-mode) @@ -192,7 +194,8 @@ DOT are intentionally being skipped." (defun oni:html-mode-func () "Function for `html-mode-hook'." (yas-minor-mode) - (fci-mode)) + (highlight-80+-mode) + (flycheck-mode)) (defun oni:indent-shift-left (start end &optional count) "Rigidly indent region. @@ -258,8 +261,7 @@ If COUNT has been specified indent by that much, otherwise look at (defun oni:js-mode-func () "Function for `js-mode-hook'." (rainbow-delimiters-mode) - (local-set-key "\C-j" 'oni:newline-and-indent) - (pretty-symbols-mode -1)) + (local-set-key "\C-j" 'oni:newline-and-indent)) (defun oni:js2-mode-func () "Function for `js2-mode-hook'." @@ -293,7 +295,8 @@ If COUNT has been specified indent by that much, otherwise look at "Function for `lua-mode-hook'." (local-unset-key (kbd ")")) (local-unset-key (kbd "]")) - (local-unset-key (kbd "}"))) + (local-unset-key (kbd "}")) + (flycheck-mode)) (defun oni:magit-log-edit-mode-func () "Function for `magit-log-edit-mode-hook'." @@ -404,24 +407,25 @@ When dealing with braces, add another line and indent that too." (defun oni:php-mode-func () "Function for `php-mode-hook'." - (flymake-mode) (local-set-key "\C-j" 'oni:newline-and-indent) (c-set-offset 'arglist-intro '+) (c-set-offset 'arglist-close '0) (rainbow-delimiters-mode) - (setq fci-rule-column 80)) + (setq-local highlight-80+-columns 80) + (flycheck-mode)) (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." + "Just make a string of either `highlight-80+-columns' or +`fill-column' length -1. Use the `-' character. WIN is +ignored." (make-string - (1- (if (boundp 'fci-rule-column) fci-rule-column fill-column)) ?-)) + (1- (if (boundp 'highlight-80+-columns) + highlight-80+-columns fill-column)) ?-)) (defun oni:prog-mode-func () "Function for `prog-mode-hook'." (rainbow-delimiters-mode) - (fci-mode) - (pretty-symbols-mode) + (highlight-80+-mode) (yas-minor-mode) (auto-fill-mode)) @@ -432,10 +436,10 @@ length -1. Use the `-' character. WIN is ignored." (local-set-key (kbd "C-<") 'python-indent-shift-left) (set (make-local-variable 'electric-indent-chars) nil) (rainbow-delimiters-mode) - (setq fci-rule-column 79 + (setq highlight-80+-columns 79 fill-column 72) (setq-local whitespace-style '(tab-mark)) - (fci-mode) + (highlight-80+-mode) (whitespace-mode)) (defun oni:raise-ansi-term (arg) |