diff options
author | Tom Willemsen | 2011-07-26 14:39:03 +0200 |
---|---|---|
committer | Tom Willemsen | 2011-07-26 14:39:49 +0200 |
commit | 605ed91a73b6e0610677dc0e6e188d02fbb68703 (patch) | |
tree | a6c8a61ed809caff1fd68dc4dcd8bd54d43df9b0 | |
parent | 8120946592434bdcbad5be5728672f22ec43b4d6 (diff) | |
download | dotfiles-605ed91a73b6e0610677dc0e6e188d02fbb68703.tar.gz dotfiles-605ed91a73b6e0610677dc0e6e188d02fbb68703.zip |
EMACS: Moved custom settings to custom.el
Also added some extra settings for autopair.
-rw-r--r-- | emacs.d/.gitignore | 1 | ||||
-rw-r--r-- | emacs.el | 22 |
2 files changed, 8 insertions, 15 deletions
diff --git a/emacs.d/.gitignore b/emacs.d/.gitignore index e2ef80f..d90d7da 100644 --- a/emacs.d/.gitignore +++ b/emacs.d/.gitignore @@ -2,3 +2,4 @@ tramp elpa bookmarks abbrev_defs +custom.el @@ -4,7 +4,10 @@ ;; Autopair (require 'autopair) (autopair-global-mode t) ; automatically add the other delimiter -(setq autopair-skip-criteria 'always) +(setq autopair-skip-criteria 'always + autopair-autowrap t + autopair-blink nil) +(setq-default autopair-dont-pair '(:string (?\' ?\") :comment (?\'))) ;; Column marker (defun set-column-markers (cm1 cm2) @@ -314,17 +317,6 @@ (set-face-foreground 'font-lock-operator-face "#EDD400") (set-face-foreground 'font-lock-end-statement "#888A85") -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(org-agenda-files (quote ("~/documents/work/aethon/aethon.org" "~/org/notes.org" "~/development/projects/aethon/myaethon/README.org" "~/documents/org/main.org"))) - '(safe-local-variable-values (quote ((ispell-dictionary . "nl") (ispell-dictionary . nl) (Mode . shell-script) (ispell-local-dictionary . nl))))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) -(put 'narrow-to-region 'disabled nil) +;; Custom file +(setq custom-file "~/.emacs.d/custom.el") +(load custom-file) |