diff options
| author |  Tom Willemsen | 2013-03-28 01:18:13 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2013-03-28 01:18:13 +0100 |
| commit | 7a477eb80367af11c6ac2c2223a38d5ed9d3778f (patch) | |
| tree | 80cffa6581ee54503dcd5a617ad03e7469c77ea3 | |
| parent | 01d77b518f4cd4df3179dea5bc88acd89f451e88 (diff) | |
| download | dotfiles-7a477eb80367af11c6ac2c2223a38d5ed9d3778f.tar.gz dotfiles-7a477eb80367af11c6ac2c2223a38d5ed9d3778f.zip | |
Emacs: Don't generate init2.el, make init.el instead
| -rw-r--r-- | emacs/.gitignore | 2 | ||||
| -rw-r--r-- | emacs/Makefile | 4 | ||||
| -rw-r--r-- | emacs/init.el | 13 | ||||
| -rw-r--r-- | emacs/init.org | 2 |
4 files changed, 4 insertions, 17 deletions
diff --git a/emacs/.gitignore b/emacs/.gitignore index 0b490df..66209de 100644 --- a/emacs/.gitignore +++ b/emacs/.gitignore @@ -13,5 +13,5 @@ templates/ rinit.* !rinit.org history -init2.el +init.el *.html diff --git a/emacs/Makefile b/emacs/Makefile index fc17095..db6203e 100644 --- a/emacs/Makefile +++ b/emacs/Makefile @@ -1,11 +1,11 @@ DESTDIR:=$(DESTDIR)/.emacs.d -objects=init.elc init.el gnus.elc gnus.el init2.elc init2.el +objects=init.elc init.el gnus.elc gnus.el modules=eshell site-lisp snippets EMACS=emacs include ../dotfiles.mk -init2.el: init.org +init.el: init.org $(EMACS) -Q -batch \ -eval "(progn (require 'org) (require 'ob-tangle) (org-babel-tangle-file \"$^\"))" diff --git a/emacs/init.el b/emacs/init.el deleted file mode 100644 index d9dc98c..0000000 --- a/emacs/init.el +++ /dev/null @@ -1,13 +0,0 @@ -;;; init.el --- ryuslash's emacs init - -;;; Commentary: -;; Does so much and changes so often - - -;;; Code: - -(load (concat user-emacs-directory "init2")) - -(provide 'init) - -;;; init.el ends here diff --git a/emacs/init.org b/emacs/init.org index 95536a7..d9b8530 100644 --- a/emacs/init.org +++ b/emacs/init.org @@ -1,7 +1,7 @@ #+TITLE: Emacs init #+LINK: yoshi-theme http://ryuslash.org/projects/yoshi-theme.html #+OPTIONS: author:nil num:nil -#+PROPERTY: tangle init2.el +#+PROPERTY: tangle init.el #+STARTUP: showall Disable the ~menu-bar-mode~, ~tool-bar-mode~ and ~scroll-bar-mode~ early on |