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 cb7c39393a778cbbcb7fe1cc38ae3719c7b6b7f1..6d873dd0fd1fdf46c61a3614bc6f3a92ed6575c5 100644 (file)
--- 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 987378abce50dec68a35e8828ada83c832658ec8..6549fde35fb0fcaac4a20cd07c3e7e2a583f3673 100644 (file)
--- 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 "$<")'