# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1290463757 18000
# Node ID fe9fcbca8f4e87904f0fa7415f2fd34331849c6f
# Parent  7b1a21c5033ee6ebe3c3ba235c3cffd9cba3178c
* lisp/Makefile.in: Fix up last merge.

diff -r 7b1a21c5033e -r fe9fcbca8f4e lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Nov 22 14:22:03 2010 -0500
+++ b/lisp/ChangeLog	Mon Nov 22 17:09:17 2010 -0500
@@ -1,5 +1,7 @@
 2010-11-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* 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  <schwab@linux-m68k.org>
-
-	* Makefile.in (ELCFILES): Update.
-
 2010-10-08  Glenn Morris  <rgm@gnu.org>
 
 	* vc/ediff-wind.el (ediff-setup-control-frame):
diff -r 7b1a21c5033e -r fe9fcbca8f4e lisp/Makefile.in
--- a/lisp/Makefile.in	Mon Nov 22 14:22:03 2010 -0500
+++ b/lisp/Makefile.in	Mon Nov 22 17:09:17 2010 -0500
@@ -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