diff options
| -rw-r--r-- | emacs | 10 | ||||
| -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 |
5 files changed, 8 insertions, 21 deletions
@@ -1,11 +1,11 @@ ;; -*- mode: Emacs-Lisp; -*- -(setq load-dir "~/.emacs.d/") -(setq elisp-dir (concat load-dir "elisp/")) +(setq d-dir "~/.emacs.d/") +(setq elisp-dir (concat d-dir "elisp/")) +(setq my-files (directory-files d-dir nil "^[0-9]\\{2\\}-\.*el$")) (setq my-elisp-files (directory-files elisp-dir nil "\\.el$")) -(setq my-files (directory-files load-dir nil "^[0-9]\\{2\\}-\.*el$")) ;; Compile 3rd party elisp files (byte-recompile-directory elisp-dir) @@ -16,9 +16,9 @@ (setq my-elisp-files (cdr my-elisp-files)))) ;; Compile my elisp files -(byte-recompile-directory load-dir) +(byte-recompile-directory d-dir) (while my-files - (let ((my-file-name (concat load-dir (car my-files)))) + (let ((my-file-name (concat d-dir (car my-files)))) (if (not (file-exists-p (concat my-file-name "c"))) (byte-compile-file my-file-name)) (load (substring my-file-name 0 (- (length my-file-name) 3))) 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) - -;;}}} |