* lisp/Makefile.in (AUTOGEN_VCS): Remove emulation/tpu-edt.el. [Backport]

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2758f48d4df4eec6cd8516512bde83b04c139d53..6680722dd4f91fd1b6751e94bf5d9a3eb39a0704 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * Makefile.in (AUTOGEN_VCS): Remove emulation/tpu-edt.el.
+
 2014-10-20  Glenn Morris  <rgm@gnu.org>
 
        * emulation/crisp.el, emulation/tpu-edt.el, emulation/tpu-extras.el:
@@ -12,7 +16,7 @@
 
        * obsolete/cc-compat.el: Make obsolete (bug#18561).
 
-       * epg-config.el (epg-gpg-program): Don't use the absolute names by default.
+       * epg-config.el (epg-gpg-program): Don't use absolute names by default.
 
        * emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg
        case (bug#18767).

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index a1cd6d19ce87885513393052f11e72915c50ff66..5e42cd16bfc897dcec74d6a66e3781bf1b9ded83 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -74,7 +74,6 @@ AUTOGENEL = loaddefs.el \
 # Note that update_loaddefs parses this.
 AUTOGEN_VCS = \
        ps-print.el \
-       emulation/tpu-edt.el \
        mail/rmail.el \
        dired.el \
        ibuffer.el \