aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2008-06-24 23:00:25 +0000
committerAndreas Schwab2008-06-24 23:00:25 +0000
commit4c3f18fe7074ed57ca9def3332689df42a6cc1d4 (patch)
tree87cb826a1a483c55b1820f3c3ace782867c78280 /src
parent463c6766f9af30f4515529b9ec02a445bd90f0f6 (diff)
downloademacs-4c3f18fe7074ed57ca9def3332689df42a6cc1d4.tar.gz
emacs-4c3f18fe7074ed57ca9def3332689df42a6cc1d4.zip
(${lispsource}/loaddefs.el): Renamed from
../lisp/loaddefs.el.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/Makefile.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e21229493b4..6a9cfc4b840 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-06-24 Andreas Schwab <schwab@suse.de>
2
3 * Makefile.in (${lispsource}/loaddefs.el): Renamed from
4 ../lisp/loaddefs.el.
5
12008-06-24 Chong Yidong <cyd@stupidchicken.com> 62008-06-24 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * buffer.h (struct buffer): New member word_wrap. 8 * buffer.h (struct buffer): New member word_wrap.
diff --git a/src/Makefile.in b/src/Makefile.in
index 140f944e0d6..67bd98df30a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1357,7 +1357,7 @@ tags: TAGS TAGS-LISP $(lwlibdir)TAGS
1357/* Since the .el.elc rule cannot specify an extra dependency, we do it here. */ 1357/* Since the .el.elc rule cannot specify an extra dependency, we do it here. */
1358${lisp} ${SOME_MACHINE_LISP}: $(BOOTSTRAPEMACS) 1358${lisp} ${SOME_MACHINE_LISP}: $(BOOTSTRAPEMACS)
1359 1359
1360../lisp/loaddefs.el: $(BOOTSTRAPEMACS) 1360${lispsource}/loaddefs.el: $(BOOTSTRAPEMACS)
1361 cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=../src/bootstrap-emacs${EXEEXT} 1361 cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=../src/bootstrap-emacs${EXEEXT}
1362 1362
1363/* Dump an Emacs executable named bootstrap-emacs containing the 1363/* Dump an Emacs executable named bootstrap-emacs containing the