mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-02 11:21:42 +00:00
Code Issues Releases Activity

* lisp/Makefile.in: Fix up last merge.

Browse Source
This commit is contained in:
Stefan Monnier 2010-11-22 17:09:17 -05:00
parent b2e4481906
commit 8a0eb85202
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -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):

1
lisp/Makefile.in
View File

@ -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