emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r100588: * Makefile.in (lisp, shortli


From: Romain Francoise
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r100588: * Makefile.in (lisp, shortlisp): Use new location of vc-hooks and ediff-hook.
Date: Sat, 12 Jun 2010 12:58:54 +0200
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 100588
committer: Romain Francoise <address@hidden>
branch nick: trunk
timestamp: Sat 2010-06-12 12:58:54 +0200
message:
  * Makefile.in (lisp, shortlisp): Use new location of vc-hooks and ediff-hook.
modified:
  src/ChangeLog
  src/Makefile.in
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-06-10 05:31:36 +0000
+++ b/src/ChangeLog     2010-06-12 10:58:54 +0000
@@ -1,3 +1,8 @@
+2010-06-12  Romain Francoise  <address@hidden>
+
+       * Makefile.in (lisp, shortlisp): Use new location of vc-hooks and
+       ediff-hook.
+
 2010-06-10  Glenn Morris  <address@hidden>
 
        * editfns.c (Fbyte_to_string): Pacify compiler.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-06-03 22:16:02 +0000
+++ b/src/Makefile.in   2010-06-12 10:58:54 +0000
@@ -458,8 +458,8 @@
        ${lispsource}textmodes/text-mode.elc \
        ${lispsource}emacs-lisp/timer.elc \
        ${lispsource}jka-cmpr-hook.elc \
-       ${lispsource}vc-hooks.elc \
-       ${lispsource}ediff-hook.elc \
+       ${lispsource}vc/vc-hooks.elc \
+       ${lispsource}vc/ediff-hook.elc \
        ${lispsource}epa-hook.elc \
        ${TOOLTIP_SUPPORT} \
        ${MSDOS_SUPPORT} \
@@ -549,9 +549,9 @@
        ../lisp/textmodes/paragraphs.elc \
        ../lisp/textmodes/text-mode.elc \
        ../lisp/emacs-lisp/timer.elc \
-       ../lisp/vc-hooks.elc \
+       ../lisp/vc/vc-hooks.elc \
+       ../lisp/vc/ediff-hook.elc \
        ../lisp/jka-cmpr-hook.elc \
-       ../lisp/ediff-hook.elc \
        ../lisp/epa-hook.elc \
        ../lisp/widget.elc \
        ../lisp/window.elc \


reply via email to

[Prev in Thread] Current Thread [Next in Thread]