aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRomain Francoise2010-06-12 12:58:54 +0200
committerRomain Francoise2010-06-12 12:58:54 +0200
commit4176cba214cb44e6370cf951a9984c03bb2c4f9c (patch)
treeb26e95661adec8732c37a1fb10165f243ab45b04 /src
parentb81a0b569166c9aa39a00d861ab5a154f3dbdea3 (diff)
downloademacs-4176cba214cb44e6370cf951a9984c03bb2c4f9c.tar.gz
emacs-4176cba214cb44e6370cf951a9984c03bb2c4f9c.zip
* Makefile.in (lisp, shortlisp): Use new location of vc-hooks and ediff-hook.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/Makefile.in8
2 files changed, 9 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 99ca9895c0e..44fe7f21ac8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-06-12 Romain Francoise <romain@orebokech.com>
2
3 * Makefile.in (lisp, shortlisp): Use new location of vc-hooks and
4 ediff-hook.
5
12010-06-10 Glenn Morris <rgm@gnu.org> 62010-06-10 Glenn Morris <rgm@gnu.org>
2 7
3 * editfns.c (Fbyte_to_string): Pacify compiler. 8 * editfns.c (Fbyte_to_string): Pacify compiler.
diff --git a/src/Makefile.in b/src/Makefile.in
index ceef8c3bf67..b2fec7eb085 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -458,8 +458,8 @@ lisp= \
458 ${lispsource}textmodes/text-mode.elc \ 458 ${lispsource}textmodes/text-mode.elc \
459 ${lispsource}emacs-lisp/timer.elc \ 459 ${lispsource}emacs-lisp/timer.elc \
460 ${lispsource}jka-cmpr-hook.elc \ 460 ${lispsource}jka-cmpr-hook.elc \
461 ${lispsource}vc-hooks.elc \ 461 ${lispsource}vc/vc-hooks.elc \
462 ${lispsource}ediff-hook.elc \ 462 ${lispsource}vc/ediff-hook.elc \
463 ${lispsource}epa-hook.elc \ 463 ${lispsource}epa-hook.elc \
464 ${TOOLTIP_SUPPORT} \ 464 ${TOOLTIP_SUPPORT} \
465 ${MSDOS_SUPPORT} \ 465 ${MSDOS_SUPPORT} \
@@ -549,9 +549,9 @@ shortlisp= \
549 ../lisp/textmodes/paragraphs.elc \ 549 ../lisp/textmodes/paragraphs.elc \
550 ../lisp/textmodes/text-mode.elc \ 550 ../lisp/textmodes/text-mode.elc \
551 ../lisp/emacs-lisp/timer.elc \ 551 ../lisp/emacs-lisp/timer.elc \
552 ../lisp/vc-hooks.elc \ 552 ../lisp/vc/vc-hooks.elc \
553 ../lisp/vc/ediff-hook.elc \
553 ../lisp/jka-cmpr-hook.elc \ 554 ../lisp/jka-cmpr-hook.elc \
554 ../lisp/ediff-hook.elc \
555 ../lisp/epa-hook.elc \ 555 ../lisp/epa-hook.elc \
556 ../lisp/widget.elc \ 556 ../lisp/widget.elc \
557 ../lisp/window.elc \ 557 ../lisp/window.elc \