emacs: The return of fill-column-indicator

This commit is contained in:
Tom Willemsen 2013-02-01 12:26:09 +01:00
parent cf22ea29f2
commit d93fdf8470

View file

@ -182,7 +182,7 @@ DOT are intentionally being skipped."
(defun oni:html-mode-func () (defun oni:html-mode-func ()
"Function for `html-mode-hook'." "Function for `html-mode-hook'."
(yas-minor-mode) (yas-minor-mode)
(highlight-80+-mode) (fci-mode)
(flycheck-mode)) (flycheck-mode))
(defun oni:ido-init () (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-intro '+)
(c-set-offset 'arglist-close '0) (c-set-offset 'arglist-close '0)
(rainbow-delimiters-mode) (rainbow-delimiters-mode)
(setq-local highlight-80+-columns 80) (setq-local fci-rule-column 80)
(flycheck-mode)) (flycheck-mode))
(defun oni:pretty-control-l-function (win) (defun oni:pretty-control-l-function (win)
"Just make a string of either `highlight-80+-columns' or "Just make a string of either `fci-rule-column' or
`fill-column' length -1. Use the `-' character. WIN is `fill-column' length -1. Use the `-' character. WIN is ignored."
ignored."
(make-string (make-string
(1- (if (boundp 'highlight-80+-columns) (1- (if (boundp 'fci-rule-column)
highlight-80+-columns fill-column)) ?-)) fci-rule-column fill-column)) ?-))
(defun oni:prog-mode-func () (defun oni:prog-mode-func ()
"Function for `prog-mode-hook'." "Function for `prog-mode-hook'."
(rainbow-delimiters-mode) (rainbow-delimiters-mode)
(highlight-80+-mode) (fci-mode)
(yas-minor-mode) (yas-minor-mode)
(auto-fill-mode)) (auto-fill-mode))
@ -441,10 +440,10 @@ ignored."
(local-set-key (kbd "C-<") 'python-indent-shift-left) (local-set-key (kbd "C-<") 'python-indent-shift-left)
(set (make-local-variable 'electric-indent-chars) nil) (set (make-local-variable 'electric-indent-chars) nil)
(rainbow-delimiters-mode) (rainbow-delimiters-mode)
(setq highlight-80+-columns 79 (setq fci-rule-column 79
fill-column 72) fill-column 72)
(setq-local whitespace-style '(tab-mark)) (setq-local whitespace-style '(tab-mark))
(highlight-80+-mode) (fci-mode)
(whitespace-mode)) (whitespace-mode))
(defun oni:rainbow-mode-init () (defun oni:rainbow-mode-init ()