Commit 8a0eb852 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/ Fix up last merge.

parent b2e44819
2010-11-22 Stefan Monnier <>
* 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 <>
* (ELCFILES): Update.
2010-10-08 Glenn Morris <>
* vc/ediff-wind.el (ediff-setup-control-frame):
......@@ -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/ 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment