diff --git a/emacs/.emacs.d/Makefile b/emacs/.emacs.d/Makefile index 0b9d68c..1ec758a 100644 --- a/emacs/.emacs.d/Makefile +++ b/emacs/.emacs.d/Makefile @@ -62,9 +62,7 @@ clean: clean-export clean-byte-compiled clean-generated ### HTML Export export: clean-export - emacs -L $(CURDIR) -L ~/.emacs.d/vendor-lisp/org/lisp \ - -L ~/.emacs.d/vendor-lisp/org/contrib/lisp -batch -l project.el \ - -f org-publish-all + $(EMACS) $(EARGS) -L $(CURDIR) -l project.el -f org-publish-all publish: export rsync -avuz --exclude=*~ --delete _publish/ \ diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org index 07d27c5..7d344a6 100644 --- a/emacs/.emacs.d/init.org +++ b/emacs/.emacs.d/init.org @@ -1,4 +1,3 @@ -#+TITLE: Emacs init #+PROPERTY: tangle init2.el #+STARTUP: content #+OPTIONS: author:nil num:nil toc:nil @@ -455,8 +454,8 @@ important questions where accidentally saying ~yes~ when you meant ~no~ would be catastrophic (or at least could be). However, I've never (so far) had this problem, and I find it quite tedious to have to - write out ~yes~ or ~no~ and then press {{{kbd(RET)}}}, give me a simple - ~y~ or ~n~ with no {{{kdb(RET)}}} required and I'm quite happy. + write out ~yes~ or ~no~ and then press {{{key(RET)}}}, give me a simple + ~y~ or ~n~ with no {{{key(RET)}}} required and I'm quite happy. #+BEGIN_SRC emacs-lisp (defalias 'yes-or-no-p 'y-or-n-p) @@ -622,7 +621,7 @@ After the ansi-term process ends it leaves a buffer. I don't use ansi term in such a way that this has ever been useful, so just kill the ansi-term buffer after the process quits, no matter the exit - status. Usually this comes about when I press {{{kbd(C-d)}}} at the + status. Usually this comes about when I press {{{key(C-d)}}} at the command prompt. #+BEGIN_SRC emacs-lisp diff --git a/emacs/.emacs.d/project.el b/emacs/.emacs.d/project.el index ba85757..7f65809 100644 --- a/emacs/.emacs.d/project.el +++ b/emacs/.emacs.d/project.el @@ -1,7 +1,3 @@ -(eval-and-compile - (require 'cask "~/projects/ext/cask/cask.el") - (cask-initialize)) - (require 'ox-publish) (require 'htmlize)