From: Stefan Monnier Date: Mon, 22 Nov 2010 22:09:17 +0000 (-0500) Subject: * lisp/Makefile.in: Fix up last merge. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~154 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8a0eb8520219bea72cac5410684b0a0ca9d3c783;p=emacs.git * lisp/Makefile.in: Fix up last merge. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ad7ee9adb3d..763d73c883b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2010-11-22 Stefan Monnier + * 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 - - * Makefile.in (ELCFILES): Update. - 2010-10-08 Glenn Morris * vc/ediff-wind.el (ediff-setup-control-frame): diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 7c42d1a94b1..2b2081a25d0 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -180,7 +180,6 @@ TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptags 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