[Emacs-diffs] /srv/bzr/emacs/trunk r102477: * lisp/Makefile.in: Fix up last merge.

[Stefan Monnier]

------------------------------------------------------------
revno: 102477
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2010-11-22 17:09:17 -0500
message:
  * lisp/Makefile.in: Fix up last merge.
modified:
  lisp/ChangeLog
  lisp/Makefile.in

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-22 19:22:03 +0000
+++ b/lisp/ChangeLog    2010-11-22 22:09:17 +0000
@@ -1,5 +1,7 @@
 2010-11-22  Stefan Monnier  <address@hidden>
 
+       * Makefile.in: Fix up last merge.
+
        * vc/diff.el (diff-old-temp-file, diff-new-temp-file): Remove.
        (diff-sentinel): Get them as arguments instead.
        (diff-old-file, diff-new-file, diff-extra-args): Remove.
@@ -2111,10 +2113,6 @@
 
        * dired.el (dired-save-positions): Doc fix.  (Bug#7119)
 
-2010-10-08  Andreas Schwab  <address@hidden>
-
-       * Makefile.in (ELCFILES): Update.
-
 2010-10-08  Glenn Morris  <address@hidden>
 
        * vc/ediff-wind.el (ediff-setup-control-frame):

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2010-11-09 20:07:10 +0000
+++ b/lisp/Makefile.in  2010-11-22 22:09:17 +0000
@@ -180,7 +180,6 @@
        els=`echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) 
$(lisptagsfiles4) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e 
"s,$(lisp)/ldefs-boot[^ ]*,,"`; \
        ${ETAGS} -o $@ $$els
 
-       $(lisp)/emacs-lisp/smie.elc \
 # The src/Makefile.in has its own set of dependencies and when they decide
 # that one Lisp file needs to be re-compiled, we had better recompile it as
 # well, otherwise every subsequent make will again call us, until we finally