EMACS: Moved custom settings to custom.el

Also added some extra settings for autopair.
This commit is contained in:
Tom Willemsen 2011-07-26 14:39:03 +02:00
parent 8120946592
commit 605ed91a73
2 changed files with 8 additions and 15 deletions

1
emacs.d/.gitignore vendored
View file

@ -2,3 +2,4 @@ tramp
elpa elpa
bookmarks bookmarks
abbrev_defs abbrev_defs
custom.el

View file

@ -4,7 +4,10 @@
;; Autopair ;; Autopair
(require 'autopair) (require 'autopair)
(autopair-global-mode t) ; automatically add the other delimiter (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 ;; Column marker
(defun set-column-markers (cm1 cm2) (defun set-column-markers (cm1 cm2)
@ -314,17 +317,6 @@
(set-face-foreground 'font-lock-operator-face "#EDD400") (set-face-foreground 'font-lock-operator-face "#EDD400")
(set-face-foreground 'font-lock-end-statement "#888A85") (set-face-foreground 'font-lock-end-statement "#888A85")
(custom-set-variables ;; Custom file
;; custom-set-variables was added by Custom. (setq custom-file "~/.emacs.d/custom.el")
;; If you edit it by hand, you could mess it up, so be careful. (load custom-file)
;; 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)