Merge remote-tracking branch 'knok/emacs-24-4'

Conflicts: ChangeLog
naota · Jan 28, 2015 · 7500526 · 7500526
2 parents 5b28d01 + 3a9a9ca
commit 7500526
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-28  NOKUBI Takatsugu  <knok@daionet.gr.jp>
+
+	* elisp-comp: load-pathの修正
+	http://peace.2ch.net/test/read.cgi/unix/1405127170/58-60
+
 2014-07-16  MIZUNUMA Yuto  <mizmiz@sf.net>
 
 	* navi2ch-net.el (navi2ch-net-send-request): https -> https://

diff --git a/elisp-comp b/elisp-comp
@@ -72,7 +72,7 @@ cp "$@" $tempdir
 
 (
   cd $tempdir
-  echo "(setq load-path (cons nil load-path))" > script
+  echo '(setq load-path (cons "." load-path))' > script
 #  $EMACS -batch -q -l script -f batch-byte-compile *.el || exit $?
   $EMACS -batch -q -l script -l ../bcomp.el || exit $?
   mv *.elc ..