diff options
author | Tom Willemsen | 2011-07-26 01:09:59 +0200 |
---|---|---|
committer | Tom Willemsen | 2011-07-26 01:09:59 +0200 |
commit | 9873823e768e59282f6ca32b3292a50cfe37d39a (patch) | |
tree | 05c0de31f56ecbbb9521ed3f4e9ce61e2069b4b8 /emacs.el | |
parent | 3de2fae2462ad216292ee3d54657d2b03d5252a8 (diff) | |
download | dotfiles-9873823e768e59282f6ca32b3292a50cfe37d39a.tar.gz dotfiles-9873823e768e59282f6ca32b3292a50cfe37d39a.zip |
Moved column-marker settings back to emacs.el
Diffstat (limited to 'emacs.el')
-rw-r--r-- | emacs.el | 28 |
1 files changed, 22 insertions, 6 deletions
@@ -1,8 +1,27 @@ ;; -*- mode: Emacs-Lisp; -*- -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; LOAD-PATHS ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (add-to-list 'load-path "~/.emacs.d/elisp") + +;; Autopair +(require 'autopair) +(autopair-global-mode t) ; automatically add the other delimiter +(setq autopair-skip-criteria 'always) + +;; Column marker +(defun set-column-markers (cm1 cm2) + (column-marker-1 cm1) + (column-marker-2 cm2)) + +(require 'column-marker) + +(dolist (hook '(prog-mode-hook html-mode-hook)) + (add-hook hook + (lambda () + (set-column-markers 73 81)))) + +(add-hook 'php-mode-hook + (lambda () + (set-column-markers 76 81))) + (add-to-list 'load-path "~/.emacs.d/elisp/markdown-mode") (add-to-list 'load-path "~/.emacs.d/elisp/git-commit-mode") (add-to-list 'load-path "~/.emacs.d/elisp/lua-mode") @@ -11,8 +30,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; REQUIRES ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(require 'autopair) -(require 'column-marker) (require 'org-crypt) (require 'rainbow-delimiters) (require 'uniquify) @@ -133,7 +150,6 @@ (delete-selection-mode t) ; delete selection upon typing (show-paren-mode t) ; show the opposite paren (ido-mode t) -(autopair-global-mode) ; automatically add the other delimiter (add-to-list 'compilation-finish-functions 'my-comp-finish-function) |