From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 23 Nov 2010 16:54:55 +0000 (+0000)
Subject: Merge remote branch 'ponder/master'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/5694bdf24c167150fc0cc475f230e20ad2c74fbb?hp=c4434c20ffaccddde838b10732b3b03fbcb5c171

Merge remote branch 'ponder/master'

* ponder/master:
  el/dot-emacs.el: New command for SSH terminal buffers.
---

diff --git a/dot/emacs b/dot/emacs
index cb7c393..6d873dd 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -23,6 +23,7 @@
 
 (setq load-path (nconc load-path (list "~/lib/emacs")))
 (require 'dot-emacs)
+(require 'cl)
 
 ;;;--------------------------------------------------------------------------
 ;;; Some random initialisation.
diff --git a/el/Makefile b/el/Makefile
index 987378a..6549fde 100644
--- a/el/Makefile
+++ b/el/Makefile
@@ -6,4 +6,4 @@ all: dot-emacs.elc
 
 .SUFFIXES: .el .elc
 .el.elc:
-	$(EMACS) --batch --no-site-file --eval '(byte-compile-file "$<")'
+	$(EMACS) -L . --batch --no-site-file --eval '(byte-compile-file "$<")'