@@ -41,3 +41,6 @@ (setq anything-input-idle-delay 0.05) (global-set-key [\M-f10] 'anything) + + +(provide 'init-anything) init-anything.el @@ -6,3 +6,5 @@ "/\\.ido\\.last$" "/\\.ecb-tip-of-day\\.el$" "/\\.viper$" "/\\.recentf$")) (require 'byte-code-cache) + +(provide 'init-byte-code-cache) init-byte-code-cache.el @@ -8,3 +8,6 @@ "Fire up slime running the swank-clojure backend" (interactive) (slime 'clojure)) + + +(provide 'init-clojure) init-clojure.el @@ -50,3 +50,6 @@ (autoload 'redshank-mode "redshank" "Minor mode for editing and refactoring (Common) Lisp code." t) (autoload 'turn-on-redshank-mode "redshank" "Turn on Redshank mode. Please see function `redshank-mode'." t) (add-hook 'lisp-mode-hook 'turn-on-redshank-mode) + + +(provide 'init-common-lisp) init-common-lisp.el @@ -8,3 +8,5 @@ (eval-after-load "grep" '(add-to-list 'grep-find-ignored-directories "_darcs")) + +(provide 'init-darcs) init-darcs.el @@ -18,3 +18,6 @@ (add-hook 'nxml-mode-hook (lambda () (add-to-list 'flyspell-prog-text-faces 'nxml-text-face))) + + +(provide 'init-flyspell) init-flyspell.el @@ -49,3 +49,6 @@ (let ((,old-size (face-attribute 'default :height))) (prog1 (progn ,@body) (set-face-attribute 'default nil :height ,old-size)))))) + + +(provide 'init-fonts) init-fonts.el @@ -42,3 +42,6 @@ ;; My config requires a local GitHub config if it can find it. ;; See http://github.com/blog/180-local-github-config (require 'gist) + + +(provide 'init-git) init-git.el @@ -12,3 +12,6 @@ (define-key haskell-mode-map [?\C-c h] 'hoogle-lookup) (turn-on-haskell-doc-mode) (turn-on-haskell-indent))) + + +(provide 'init-haskell) init-haskell.el @@ -27,3 +27,6 @@ cmd-list))))) (global-set-key "\M-x" 'ido-execute) + + +(provide 'init-ido) init-ido.el @@ -50,3 +50,6 @@ (local-set-key "\C-c\C-b" 'js-send-buffer-and-go) (local-set-key "\C-cl" 'js-load-file-and-go) )) + + +(provide 'init-javascript) init-javascript.el @@ -17,3 +17,6 @@ (add-hook 'emacs-lisp-mode-hook 'pretty-lambdas) (add-hook 'emacs-lisp-mode-hook (lambda () (enable-paredit emacs-lisp-mode-map))) + + +(provide 'init-lisp) init-lisp.el @@ -11,3 +11,6 @@ (defun maximized-p (&optional frame) (and (<= (abs (- (mf-max-display-pixel-width) (frame-pixel-width frame))) (frame-char-width frame)) (<= (abs (- (mf-max-display-pixel-height) (+ mf-display-padding-height (frame-pixel-height frame)))) (+ 5 (frame-char-height frame))))) + + +(provide 'init-maxframe) init-maxframe.el @@ -9,3 +9,6 @@ (add-hook 'nxml-mode-hook (lambda () (make-variable-buffer-local 'ido-use-filename-at-point) (setq ido-use-filename-at-point nil))) + + +(provide 'init-nxml) init-nxml.el @@ -19,3 +19,6 @@ (lambda () (require 'pymacs) (pymacs-load "ropemacs" "rope-"))) + + +(provide 'init-python-mode) init-python-mode.el @@ -7,3 +7,7 @@ (require 'rinari) (add-hook 'rails-minor-mode-hook (lambda () (local-set-key [f6] 'recompile))) + + + +(provide 'init-rails) init-rails.el @@ -81,3 +81,6 @@ (add-hook 'ruby-mode-hook (lambda () (local-set-key [f7] 'ruby-compilation-this-test))) (add-hook 'ruby-mode-hook (lambda () (local-set-key [f6] 'recompile))) + + +(provide 'init-ruby-mode) init-ruby-mode.el @@ -15,3 +15,6 @@ (funcall (split-window-func-with-other-buffer 'split-window-horizontally)))) (global-set-key "\C-x|" 'split-window-horizontally-instead) + + +(provide 'init-window-split) init-window-split.el @@ -42,14 +42,14 @@ ;; Automatically byte-compile .el files ;;---------------------------------------------------------------------------- (when *byte-code-cache-enabled* - (load "init-byte-code-cache")) + (require 'init-byte-code-cache)) ;;---------------------------------------------------------------------------- ;; Use elisp package manager (http://tromey.com/elpa/) ;;---------------------------------------------------------------------------- (setq load-path (cons (expand-file-name "~/.emacs.d/elpa") load-path)) -(load "package") +(require 'package) (package-initialize) @@ -310,7 +310,7 @@ in `exec-path', or nil if no such command exists" ;;---------------------------------------------------------------------------- ;; Javascript ;;---------------------------------------------------------------------------- -(load "init-javascript") +(require 'init-javascript) ;;---------------------------------------------------------------------------- ;; Extensions -> Modes @@ -349,13 +349,13 @@ in `exec-path', or nil if no such command exists" ;; Darcs ;;---------------------------------------------------------------------------- (when *darcs-support-enabled* - (load "init-darcs")) + (require 'init-darcs)) ;;---------------------------------------------------------------------------- ;; Git ;;---------------------------------------------------------------------------- -(load "init-git") +(require 'init-git) ;;---------------------------------------------------------------------------- @@ -371,8 +371,8 @@ in `exec-path', or nil if no such command exists" ;;---------------------------------------------------------------------------- (require 'recentf) (setq recentf-max-saved-items 100) -(load "init-ido") -(load "init-anything") +(require 'init-ido) +(require 'init-anything) ;;---------------------------------------------------------------------------- @@ -403,7 +403,8 @@ in `exec-path', or nil if no such command exists" ;;---------------------------------------------------------------------------- ;; When splitting window, show (other-buffer) in the new window ;;---------------------------------------------------------------------------- -(load "init-window-split") +(require 'init-window-split) + ;;---------------------------------------------------------------------------- ;; Desktop saving @@ -449,13 +450,13 @@ in `exec-path', or nil if no such command exists" (tool-bar-mode -1) (scroll-bar-mode -1) -(load "init-maxframe") +(require 'init-maxframe) ;;---------------------------------------------------------------------------- ;; Fonts ;;---------------------------------------------------------------------------- -(load "init-fonts") +(require 'init-fonts) ;;---------------------------------------------------------------------------- @@ -504,7 +505,7 @@ in `exec-path', or nil if no such command exists" ;;---------------------------------------------------------------------------- ;; NXML ;;---------------------------------------------------------------------------- -(load "init-nxml") +(require 'init-nxml) ;;---------------------------------------------------------------------------- @@ -522,15 +523,15 @@ in `exec-path', or nil if no such command exists" ;;---------------------------------------------------------------------------- ;; Python ;;---------------------------------------------------------------------------- -(load "init-python-mode") +(require 'init-python-mode) ;;---------------------------------------------------------------------------- ;; Ruby & Rails ;;---------------------------------------------------------------------------- -(load "init-ruby-mode") +(require 'init-ruby-mode) (when *rails-support-enabled* - (load "init-rails")) + (require 'init-rails)) ;;---------------------------------------------------------------------------- @@ -594,11 +595,11 @@ in `exec-path', or nil if no such command exists" ;;---------------------------------------------------------------------------- ;; Lisp / Scheme / Slime ;;---------------------------------------------------------------------------- -(load "init-lisp") +(require 'init-lisp) (when *common-lisp-support-enabled* - (load "init-common-lisp")) + (require 'init-common-lisp)) (when *clojure-support-enabled* - (load "init-clojure")) + (require 'init-clojure)) (when *scheme-support-enabled* ; See http://bc.tech.coop/scheme/scheme-emacs.htm (require 'quack)) @@ -607,7 +608,7 @@ in `exec-path', or nil if no such command exists" ;; Haskell ;;---------------------------------------------------------------------------- (when *haskell-support-enabled* - (load "init-haskell")) + (require 'init-haskell)) ;;---------------------------------------------------------------------------- @@ -623,7 +624,7 @@ in `exec-path', or nil if no such command exists" ;; Add spell-checking in comments for all programming language modes ;;---------------------------------------------------------------------------- (when *spell-check-support-enabled* - (load "init-flyspell")) + (require 'init-flyspell)) ;;---------------------------------------------------------------------------- init.el 8ca3994d88fab7df32bfe11327ad907c25b8643b Steve Purcell steve@sanityinc.com http://github.com/purcell/emacs.d/commit/8cbd1bc3703a955254c347562f0c3329bd80bf81 8cbd1bc3703a955254c347562f0c3329bd80bf81 2009-02-18T08:26:02-08:00 2009-02-18T08:26:02-08:00 Convert each 'load' call for initialisation scripts into a 'require' 56237ff779d5738e04ae7629012e414a73c7cbf1 Steve Purcell steve@sanityinc.com