Permalink
Browse files

Use (require) instead of (load).

  • Loading branch information...
1 parent 94d9891 commit 388c8e66763e64f5f1e58553799e710ca2d1f11d @bodil committed Jan 12, 2013
View
@@ -19,3 +19,5 @@
(lambda ()
(add-to-list 'ac-sources 'ac-source-clang-async)
(launch-completion-proc)))
+
+(provide 'bodil-c)
View
@@ -32,3 +32,5 @@
(add-to-list 'load-path (concat dotfiles-dir "site-lisp/ethan-wspace/lisp"))
(require 'ethan-wspace)
(global-ethan-wspace-mode 1)
+
+(provide 'bodil-codestyle)
View
@@ -25,3 +25,5 @@
(lambda ()
(require 'ac-source-nrepl)
(setq ac-sources (append '(ac-source-nrepl) ac-sources)))))
+
+(provide 'bodil-complete)
View
@@ -50,5 +50,7 @@
+
+
(provide 'bodil-defuns)
;;; bodil-defuns.el ends here
View
@@ -44,3 +44,5 @@
name (file-name-nondirectory new-name)))))))
(global-set-key (kbd "C-x C-r") 'rename-current-buffer-file)
+
+(provide 'bodil-dired)
View
@@ -15,6 +15,7 @@
;; Multiple cursors!
(require 'multiple-cursors)
+(global-set-key (kbd "C-S-c C-S-c") 'mc/edit-lines)
(global-set-key (kbd "C-æ") 'mc/mark-previous-like-this)
(global-set-key (kbd "C-'") 'mc/mark-next-like-this)
(global-set-key (kbd "C-M-'") 'mc/mark-more-like-this-extended)
@@ -77,3 +78,5 @@
;; Some bindings for special characters
(global-set-key (kbd "M--") (lambda () (interactive) (insert "")))
(global-set-key (kbd "M-l") (lambda () (interactive) (insert "lambda")))
+
+(provide 'bodil-editing)
View
@@ -11,3 +11,5 @@
(lambda ()
(define-key erlang-shell-mode-map (kbd "C-\\")
'erlang-complete-tag)))
+
+(provide 'bodil-erlang)
View
@@ -2,3 +2,5 @@
(autoload 'flycheck-mode "flycheck" nil t)
(add-hook 'find-file-hook 'flycheck-mode)
+
+(provide 'bodil-flycheck)
View
@@ -39,15 +39,15 @@ Symbols matching the text at point are put first in the completion list."
(cond
((and (listp symbol) (imenu--subalist-p symbol))
(addsymbols symbol))
-
+
((listp symbol)
(setq name (car symbol))
(setq position (cdr symbol)))
-
+
((stringp symbol)
(setq name symbol)
(setq position (get-text-property 1 'org-imenu-marker symbol))))
-
+
(unless (or (null position) (null name))
(add-to-list 'symbol-names name)
(add-to-list 'name-and-pos (cons name position))))))))
@@ -69,3 +69,5 @@ Symbols matching the text at point are put first in the completion list."
(set-default 'imenu-auto-rescan t)
(global-set-key (kbd "C-t") 'ido-imenu)
+
+(provide 'bodil-ido)
View
@@ -103,3 +103,5 @@
(autoload 'typescript-mode "typescript" nil t)
(add-to-list 'auto-mode-alist '("\\.ts$" . typescript-mode))
+
+(provide 'bodil-js)
View
@@ -135,3 +135,5 @@ Display the results in a hyperlinked *compilation* buffer."
" clojure.main -i "
datomic-path
"bin/bridge.clj -r")))))
+
+(provide 'bodil-lisp)
View
@@ -79,3 +79,5 @@ filtered by a user-provided regexp."
(if (and buffer (with-current-buffer buffer buffer-read-only))
(error "File `%s' is visited read-only" file))))
(tags-query-replace from-string to-string delimited 'file-list))))
+
+(provide 'bodil-magit)
View
@@ -7,3 +7,5 @@
(add-to-list 'auto-mode-alist '("\\.markdown$" . markdown-mode))
(add-to-list 'auto-mode-alist '("\\.md$" . markdown-mode))
+
+(provide 'bodil-markdown)
View
@@ -16,3 +16,5 @@
(autoload 'rename-sgml-tag "rename-sgml-tag" nil t)
(eval-after-load "nxhtml-mode"
'(define-key nxhtml-mode-map (kbd "C-c C-r") 'rename-sgml-tag))
+
+(provide 'bodil-markup)
View
@@ -2,3 +2,5 @@
;; Stop org-mode from highjacking shift-cursor keys
(setq org-replace-disputed-keys t)
+
+(provide 'bodil-orgmode)
View
@@ -9,3 +9,5 @@
'python-mode-hook
(lambda ()
(define-key python-mode-map (kbd "C-c C-,") 'pytest-run-file)))
+
+(provide 'bodil-python)
View
@@ -4,3 +4,5 @@
(setq desktop-restore-eager 5)
(setq desktop-save (quote if-exists))
(desktop-save-mode 1)
+
+(provide 'bodil-session)
View
@@ -7,3 +7,5 @@
;; Load Magnar's snippet helpers
(require 'snippet-helpers)
(require 'buster-snippet-helpers)
+
+(provide 'bodil-snippets)
View
@@ -15,3 +15,5 @@
;; Likewise, yasnippet breaks the tab key.
(add-hook 'term-mode-hook
(lambda() (yas-minor-mode -1)))
+
+(provide 'bodil-terminal)
View
@@ -74,3 +74,5 @@
;; Engage!
(require 'nyan-mode)
(nyan-mode 1)
+
+(provide 'bodil-theme)
View
@@ -1,3 +1,5 @@
;;; bodil-twitter.el -- Twittering-mode
(require 'twittering-mode)
+
+(provide 'bodil-twitter)
View
@@ -4,9 +4,9 @@
(defun toggle-fullscreen ()
(interactive)
(x-send-client-message nil 0 nil "_NET_WM_STATE" 32
- '(2 "_NET_WM_STATE_MAXIMIZED_VERT" 0))
+ '(2 "_NET_WM_STATE_MAXIMIZED_VERT" 0))
(x-send-client-message nil 0 nil "_NET_WM_STATE" 32
- '(2 "_NET_WM_STATE_MAXIMIZED_HORZ" 0)))
+ '(2 "_NET_WM_STATE_MAXIMIZED_HORZ" 0)))
(toggle-fullscreen)
;; Define a function for making desktop notifications
@@ -24,3 +24,4 @@
'(:array (:dict-entry "x-canonical-append" (:variant "allowed")))
':int32 timeout))
+(provide 'bodil-x11)
View
@@ -70,29 +70,29 @@
(list 'if (eq window-system 'x) (cons 'progn x)))
;; Now load other things
-(dolist (file '("bodil-defuns.el"
- "bodil-session.el"
- "bodil-theme.el"
- "bodil-editing.el"
- "bodil-snippets.el"
- "bodil-complete.el"
- "bodil-ido.el"
- "bodil-lisp.el"
- "bodil-js.el"
- "bodil-markup.el"
- "bodil-c.el"
- "bodil-markdown.el"
- "bodil-python.el"
- "bodil-erlang.el"
- "bodil-magit.el"
- "bodil-terminal.el"
- "bodil-twitter.el"
- "bodil-orgmode.el"
- "bodil-flycheck.el"
- "bodil-codestyle.el"
- "bodil-dired.el"))
- (load (concat dotfiles-dir file)))
-(Xlaunch (load (concat dotfiles-dir "bodil-x11.el")))
+(dolist (file '(bodil-defuns
+ bodil-session
+ bodil-theme
+ bodil-editing
+ bodil-snippets
+ bodil-complete
+ bodil-ido
+ bodil-lisp
+ bodil-js
+ bodil-markup
+ bodil-c
+ bodil-markdown
+ bodil-python
+ bodil-erlang
+ bodil-magit
+ bodil-terminal
+ bodil-twitter
+ bodil-orgmode
+ ;; bodil-flycheck
+ bodil-codestyle
+ bodil-dired))
+ (require file))
+(Xlaunch (require 'bodil-x11))
;; Load custom settings
(load custom-file 'noerror)

0 comments on commit 388c8e6

Please sign in to comment.