diff options
author | Tom Willemsen | 2011-04-15 09:48:38 +0200 |
---|---|---|
committer | Tom Willemsen | 2011-04-15 09:48:38 +0200 |
commit | 9420f67c17e28249e5c1a0a39c85833fdb1ccd8d (patch) | |
tree | eef2c67b9020c684c53282b88cb14d26bd3c6906 /emacs.d | |
parent | f2a0e6c81128e5892fa81e1e26677ae41e41e0d5 (diff) | |
download | dotfiles-9420f67c17e28249e5c1a0a39c85833fdb1ccd8d.tar.gz dotfiles-9420f67c17e28249e5c1a0a39c85833fdb1ccd8d.zip |
Changed load-dir to d-dir, autopair, no comments
* Changed the load-dir variable in .emacs to d-dir (from emacs._d_).
Using the same variable as emacs didn't seem like a good idea to me.
* Moved autopair settings from 10-modules and 10-settings to
20-autopair
* Removed the folding-mode comments from load files.
Diffstat (limited to 'emacs.d')
-rw-r--r-- | emacs.d/10-modules.el | 6 | ||||
-rw-r--r-- | emacs.d/10-settings.el | 1 | ||||
-rw-r--r-- | emacs.d/20-autopair.el | 2 | ||||
-rw-r--r-- | emacs.d/20-column-marker.el | 10 |
4 files changed, 3 insertions, 16 deletions
diff --git a/emacs.d/10-modules.el b/emacs.d/10-modules.el index 0546dcb..18731d7 100644 --- a/emacs.d/10-modules.el +++ b/emacs.d/10-modules.el @@ -1,8 +1,5 @@ -;;{{{ Requires (require 'naquadah-theme) -(require 'autopair) -;;}}} -;;{{{ Auto loads + (autoload 'vala-mode "vala-mode" "A Major mode for editing Vala files" t) (autoload 'csharp-mode "csharp-mode" @@ -19,4 +16,3 @@ "A Major mode for editing PHP files" t) (autoload 'graphviz-dot-mode "graphviz-dot-mode" "A Major mode for editing graphviz dot files" t) -;;}}} diff --git a/emacs.d/10-settings.el b/emacs.d/10-settings.el index 3de828e..cd17d9a 100644 --- a/emacs.d/10-settings.el +++ b/emacs.d/10-settings.el @@ -24,7 +24,6 @@ (global-font-lock-mode t) ; show syntax highlighting, old (show-paren-mode t) ; show matching parens (delete-selection-mode t) ; delete selection upon typing -(autopair-global-mode) ;; Byte-compile elisp files on save (add-hook 'before-save-hook 'delete-trailing-whitespace) diff --git a/emacs.d/20-autopair.el b/emacs.d/20-autopair.el new file mode 100644 index 0000000..15ae07a --- /dev/null +++ b/emacs.d/20-autopair.el @@ -0,0 +1,2 @@ +(require 'autopair) +(autopair-global-mode) diff --git a/emacs.d/20-column-marker.el b/emacs.d/20-column-marker.el index 43cc35d..fddad31 100644 --- a/emacs.d/20-column-marker.el +++ b/emacs.d/20-column-marker.el @@ -1,19 +1,9 @@ -;;{{{ Load - (require 'column-marker) -;;}}} -;;{{{ Functions - (defun set-column-marker () (column-marker-1 73) (column-marker-2 81)) -;;}}} -;;{{{ Hooks - (add-hook 'c-mode-hook 'set-column-marker) (add-hook 'emacs-lisp-mode-hook 'set-column-marker) (add-hook 'html-mode-hook 'set-column-marker) - -;;}}} |