From d93fdf847067197ab482c28503f71f1bf1bb8e70 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Fri, 1 Feb 2013 12:26:09 +0100 Subject: [PATCH] emacs: The return of fill-column-indicator --- .emacs.d/site-lisp/oni.el | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index d6aae02..3fcbcd1 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -182,7 +182,7 @@ DOT are intentionally being skipped." (defun oni:html-mode-func () "Function for `html-mode-hook'." (yas-minor-mode) - (highlight-80+-mode) + (fci-mode) (flycheck-mode)) (defun oni:ido-init () @@ -416,21 +416,20 @@ When dealing with braces, add another line and indent that too." (c-set-offset 'arglist-intro '+) (c-set-offset 'arglist-close '0) (rainbow-delimiters-mode) - (setq-local highlight-80+-columns 80) + (setq-local fci-rule-column 80) (flycheck-mode)) (defun oni:pretty-control-l-function (win) - "Just make a string of either `highlight-80+-columns' or -`fill-column' length -1. Use the `-' character. WIN is -ignored." + "Just make a string of either `fci-rule-column' or +`fill-column' length -1. Use the `-' character. WIN is ignored." (make-string - (1- (if (boundp 'highlight-80+-columns) - highlight-80+-columns fill-column)) ?-)) + (1- (if (boundp 'fci-rule-column) + fci-rule-column fill-column)) ?-)) (defun oni:prog-mode-func () "Function for `prog-mode-hook'." (rainbow-delimiters-mode) - (highlight-80+-mode) + (fci-mode) (yas-minor-mode) (auto-fill-mode)) @@ -441,10 +440,10 @@ ignored." (local-set-key (kbd "C-<") 'python-indent-shift-left) (set (make-local-variable 'electric-indent-chars) nil) (rainbow-delimiters-mode) - (setq highlight-80+-columns 79 + (setq fci-rule-column 79 fill-column 72) (setq-local whitespace-style '(tab-mark)) - (highlight-80+-mode) + (fci-mode) (whitespace-mode)) (defun oni:rainbow-mode-init ()